Merge branch 'order_report_1102'

app/Admin/Repositories/v3/OrderReport.php

@@ -42,8 +42,8 @@ class OrderReport extends EloquentRepository
         //     $endTime = $searchTime['end_time'];
         // }
        
-        $orderMainOnline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5])->where('type',OrderMainModel::ORDER_TYPE_ONLINE);
-        $orderMainOffline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5])->where('type',OrderMainModel::ORDER_TYPE_OFFLINE);
+        $orderMainOnline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5,10,11])->where('type',OrderMainModel::ORDER_TYPE_ONLINE);
+        $orderMainOffline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5,10,11])->where('type',OrderMainModel::ORDER_TYPE_OFFLINE);
         // 旧商户流水  
         $storeNewUser = StoreAccountModel::select(DB::raw("SUM( CASE WHEN note = '新用户下单成功，平台奖励' THEN 1 ELSE 0 END ) AS new_add_total, SUM( CASE WHEN note = '新用户下单成功，平台奖励' THEN money ELSE 0 END ) AS new_user_total_money,SUM( CASE WHEN note = '用户下单成功，平台奖励' THEN money ELSE 0 END ) AS store_total_money"));
         // 新商户流水 获取所有模型