admin

application/admin/controller/Overview.php

@@ -53,6 +53,12 @@ class Overview extends Backend
                 'total'=>$list->total(),
             ]);
         }
+
+        $order = new Orders();
+        $order_info = new OrderInfo();
+        $refund = new Refund();
+
+
         list($postTime,$postTimeArr) = $this->rangeTime('startTime');
         $dayNum=ceil(($postTimeArr[1]-$postTimeArr[0])/86400);
         $dayStart=Carbon::createFromTimestamp($postTimeArr[0]);
@@ -64,11 +70,25 @@ class Overview extends Backend
                 'mll'=>[],
             ];
         }
-        $orderData=Orders::payed()->filterDate($postTimeArr)->field('amount_pay,amount_profit_per,create_time')->select();
+        $orderData=Orders::where('status','in','5,10,20')->filterDate($postTimeArr)->field('id,amount_pay,amount_profit_per,create_time')->select();
         foreach ($orderData as $orderd){
+            // 0508修改
+            $sale = $orderd['amount_pay'];
+            $record = $order_info->where('order_id',$orderd['id'])->field('sum(amount_cost_total) as amount_cost_total,sum(is_amount_last) as is_amount_last')->find();
+            $amount_cost_total = $order_info->where('order_id',$orderd['id'])->where('is_amount_last','gt','0')->sum('amount_cost_total');
+            $total_sale = bcsub($sale,$record['is_amount_last']); // 总销售额 不包含已审核通过的退货退款、取消订单
+            //毛利、毛利率
+            $total_cost = bcsub($record['amount_cost_total'],$amount_cost_total); // 总成本-退款成本
+            $gross_profit = $total_sale - $total_cost; // 毛利
+            $gross_profit_margin = 0;
+            if($total_sale > 0){
+                $gross_profit_margin = round($gross_profit/$total_sale,2)*100;//毛利率
+                $chat1_x[$day]['amount'][]=$total_sale;
+                $chat1_x[$day]['mll'][]=$gross_profit_margin;
+            }
             $day=Carbon::createFromTimestamp($orderd['create_time'])->format('Y-m-d');
-            $chat1_x[$day]['amount'][]=$orderd['amount_pay'];
-            $chat1_x[$day]['mll'][]=$orderd['amount_profit_per'];
+//            $chat1_x[$day]['amount'][]=$orderd['amount_pay'];
+//            $chat1_x[$day]['mll'][]=$orderd['amount_profit_per'];
         }
         $chat1_amount=[];
         $chat1_mll=[];
@@ -76,6 +96,7 @@ class Overview extends Backend
             $chat1_amount[]=bcadd(0,array_sum($chat1_xd['amount']));
             $chat1_mll[]=count($chat1_xd['mll'])>0?bcdiv(array_sum($chat1_xd['mll']),count($chat1_xd['mll'])):0;
         }
+
         $this->assignconfig('chat1_x',array_keys($chat1_x));
         $this->assignconfig('chat1_amount',$chat1_amount);
         $this->assignconfig('chat1_mll',$chat1_mll);
@@ -90,10 +111,6 @@ class Overview extends Backend
             $map['createtime'] = array('between',[$startTime,$endTime]);
         }
 
-
-        $order = new Orders();
-        $order_info = new OrderInfo();
-        $refund = new Refund();
         //总销售额
         $sale = $order->where($where)->where('status','in','5,10,20')->sum('amount_pay');
         $orderIds = $order->where($where)->where('status','in','5,10,20')->column('id');
@@ -107,7 +124,7 @@ class Overview extends Backend
         $total_cost = bcsub($record['amount_cost_total'],$amount_cost_total); // 总成本-退款成本
         $gross_profit = $total_sale - $total_cost; // 毛利
         $gross_profit_margin = 0;
-        if($sale > 0)$gross_profit_margin = round($gross_profit/$total_sale,2)*100;//毛利率
+        if($total_sale > 0)$gross_profit_margin = round($gross_profit/$total_sale,2)*100;//毛利率
 
         //$refund = Db('OrderInfoRefund')->where($where)->where('refund_status',20)->sum('amount');
 //        $sale = bcsub($sale,0);