pc

application/admin/controller/GoodsData.php

@@ -44,13 +44,7 @@ class GoodsData extends Backend
         //某一时间段各单品订单数量占比
         $infoModel = new OrderInfo();
         $orderIds = Db("Orders")->where($where)->where('status', 'in', '5,10,20,30')->column('id');
-        /*$goodsList = $infoModel
-            ->where($where)
-            ->where('order_id','in',$orderIds)
-            ->where('is_return_goods',0)
-            ->field('goods_id,goods_name, sum(amount_pay) AS amount_total')
-            ->group('goods_id')
-            ->select();*/
+
         $goodsList=\app\admin\model\Goods::order('id','desc')->field('id as goods_id,name as goods_name')->select()->toArray();
         $goods = [];
         $goodsSale = [];
@@ -67,27 +61,7 @@ class GoodsData extends Backend
                 ->count();
             $goods[$v['goods_name']] = $v['nums'];
             $goodsSale[$v['goods_name']] = $v['amount_total'];
-            /*$saleTotal =  $infoModel
-                ->where($where)
-                ->where('order_id','in',$orderIds)
-                ->where('goods_id',$v['goods_id'])
-                ->where('is_return_goods',0)
-                ->sum('amount');//某商品总销售额*/
 
-            /*$saleTotalNum =$infoModel
-                ->where($where)
-                ->where('order_id','in',$orderIds) ->where('is_return_goods',0)
-                ->where('goods_id',$v['goods_id'])->count();*/
-            /*$saleTotal = $saleTotal*$saleTotalNum;
-            $amountCostTotal =  $infoModel
-                ->where($where)
-                ->where('order_id','in',$orderIds)
-                ->where('is_return_goods',0)
-                ->where('goods_id',$v['goods_id'])->sum('amount_cost_total');//某商品总成本*/
-            //$amountCostTotal = $amountCostTotal*$saleTotalNum;
-            //$gross = bcsub($saleTotal, $amountCostTotal);//某商品毛利
-            //$grossRate = 0;
-            //if ($saleTotal > 0) $grossRate = round($gross / $saleTotal, 2) * 100;//某商品毛利率
             $goodsGross[$v['goods_name']] = bcadd(OrderInfo::payed()->where('goods_id',$v['goods_id'])->filterDate($postTimeArr)->sum('amount_profit'),0);
             $goodsGrossRate[$v['goods_name']] = bcadd(OrderInfo::payed()->where('goods_id',$v['goods_id'])->filterDate($postTimeArr)->avg('amount_profit_per'),0);
         }