|
@@ -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]);
|