控制台充值额调整

app/admin/controller/order/WholeController.php

@@ -101,6 +101,10 @@ class WholeController extends Curd
                 ->pluck('join_pay_order_id')
                 ->toArray();
             $where['order_groupby'] = ['in', $groupIds];
+        }else if ($type == 'todayRechargeOrder'){
+            $where['order_classify'] = ['in',['RECHARGE','COMBINE','PARTNER','REFERRER','VIP']];
+            $todayTimeUnix = strtotime(date('Y-m-d') . ' 00:00:00');
+            $where['order_addtimes'] = ['>',$todayTimeUnix];
         }
         $orderIds = [];
         if (!empty($where['order_id'])) {
@@ -158,10 +162,6 @@ class WholeController extends Curd
         } elseif (!empty($orderIds)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         }
-//        if (empty($where['order_category'])) {
-//            // 充值订单不显示
-//            $where['order_category'] = ['<>', 'RECHARGE'];
-//        }
         // 自提订单        
         if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP') {
             $where['order_is_complete'] = 'N';

app/admin/service/statistics/OrderService.php

@@ -29,7 +29,7 @@ class OrderService
         // 今日充值额
         $data['todayRecharge'] = Order::where('order_status_payment', 'SUCCESS')
             ->where('order_addtimes', '>', $todayTimeUnix)
-            ->where('order_category', 'RECHARGE')
+            ->whereIn('order_category', ['RECHARGE','COMBINE','PARTNER','REFERRER','VIP'])
             ->where('order_status_payment', 'SUCCESS')
             ->sum('order_amount_pay');
         // 今日退单