优化

app/Http/Controllers/Admin/StatisticsController.php

@@ -570,6 +570,7 @@ class StatisticsController extends Controller
             if($etime) $query->where('dtime', '<=', $etime);
         })->where('is_del',0)->groupBy('dtime')->orderBy('dtime', 'desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
+        $end_time = date('Y-m-d');
         foreach($result as $k=>&$v){
             #进粉成本
             $v['cost_fan'] = $v['total_fan_add']>0? round($v['total_cost'] / $v['total_fan_add'], 2) : '';
@@ -594,9 +595,10 @@ class StatisticsController extends Controller
              //当日加粉
             $phones = DB::table('customers')->where('fanTime', $v['dtime'])->lists('phone');
             #当日加粉订单总计：
+            #截止昨天           
             $order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count, sum(cost) as order_cost, sum(freight_cost) as freight_cost'))->whereIn('receiverMobile', $phones)->where('is_del', 0)->where(function($query) use($team_id){
                 if($team_id>0) $query->where('team_id', $team_id);
-            })->first();
+            })->where('createTime','<',$end_time)->first();
             #当日新粉成单：            
             $new_order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count'))->where('createTime','>=', $v['dtime'])->where('createTime','<', $v['dtime'].' 23:59:59')->where('is_del', 0)->whereIn('receiverMobile', $phones)->where(function($query) use($team_id){
                 if($team_id>0) $query->where('team_id', $team_id);
@@ -650,6 +652,7 @@ class StatisticsController extends Controller
             if($etime) $query->where('dtime', '<=', $etime);
         })->where('is_del',0)->groupBy('dtime')->orderBy('dtime', 'desc')->get();
         $result = json_decode(json_encode($result),true);
+        $end_time = date('Y-m-d');
         foreach($result as $k=>&$v){
             #进粉成本
             $v['cost_fan'] = $v['total_fan_add']>0? round($v['total_cost'] / $v['total_fan_add'], 2) : '';
@@ -667,7 +670,7 @@ class StatisticsController extends Controller
             #当日订单数、销售额
             $order = DB::table('order')->select(DB::raw('sum(receivedAmount) as order_amount, count(1) as order_count'))->where('createTime','>=', $v['dtime'])->where('createTime','<', $v['dtime'].' 23:59:59')->where('is_del', 0)->where(function($query) use($team_id){
                 if($team_id>0) $query->where('team_id', $team_id);
-            })->first();
+            })->where('createTime','<',$end_time)->first();
             $v['order_count'] = $order->order_count;
             $v['order_amount'] = $order->order_amount;