|
@@ -4428,6 +4428,7 @@ class WholeController extends Curd
|
|
|
$todayTimeUnix = strtotime(date('Y-m-d') . ' 00:00:00');
|
|
|
$groupIds = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
|
|
|
->where('join_pay_order_id', '<>', '')
|
|
|
+ ->where('pay_prepayid', '<>', '')
|
|
|
->where('pay_category', '<>', 'RETURN')
|
|
|
->where('pay_category', '<>', 'RECHARGE')
|
|
|
->where('pay_category', '<>', 'CLEAR')
|
|
@@ -4560,6 +4561,7 @@ class WholeController extends Curd
|
|
|
->where(function ($query) use ($item) {
|
|
|
$query->whereJsonContains('join_pay_object_json->order_id', $item['order_id'])->orWhere('join_pay_object_json', '')->orWhereNull('join_pay_object_json');
|
|
|
})->where('pay_status', 'SUCCESS')
|
|
|
+ ->where('pay_prepayid', '<>', '')
|
|
|
->where('pay_category', '<>', 'REFUND')
|
|
|
->get()
|
|
|
->toArray();
|