Browse Source

完善功能

gorden 7 months ago
parent
commit
42b7bc438c
1 changed files with 4 additions and 2 deletions
  1. 4 2
      app/admin/controller/order/WholeController.php

+ 4 - 2
app/admin/controller/order/WholeController.php

@@ -2358,8 +2358,10 @@ class WholeController extends Curd
             'refund' => function ($query) {
                 $query->select('join_return_order_id', 'orders_return_id', 'order_return_status');
             },
-        ])->where('join_sheet_member_id', $memberId)
-            ->where('order_category','<>','RECHARGE')
+        ])
+        ->leftJoin('order','order.order_id','order_sheet.join_sheet_order_id')
+            ->where('join_sheet_member_id', $memberId)
+            ->where('order.order_category','<>','RECHARGE')
             ->when(!empty($datetime), function($query) use ($datetime){
                 $datetime[0] = strtotime($datetime[0]);
                 $datetime[1] = strtotime($datetime[1]);