|
@@ -853,7 +853,8 @@ class MemberController
|
|
|
$query->where('pay_prepayid', 'like', '%CASH%');
|
|
|
}
|
|
|
])->whereIn('order_groupby', $payDetailIds)
|
|
|
- ->where('order_addtimes', '>', $firstRechargeTime);
|
|
|
+ ->where('order_addtimes', '>', $firstRechargeTime)
|
|
|
+ ->whereIn('order_classify',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','DISHES']);
|
|
|
$total = $orders->count();
|
|
|
$rows = $orders->orderBy('order_addtimes', 'DESC')
|
|
|
->forPage($page, $pageSize)
|
|
@@ -941,6 +942,7 @@ class MemberController
|
|
|
}
|
|
|
])->whereIn('order_groupby', $payDetailIds)
|
|
|
->where('order_addtimes', '>', $firstRechargeTime)
|
|
|
+ ->whereIn('order_classify',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','DISHES'])
|
|
|
->orderBy('order_addtimes', 'DESC')
|
|
|
->get()
|
|
|
->toArray();
|