|
@@ -406,7 +406,7 @@ class MemberService
|
|
|
$query->where('join_pay_member_id', $memberId)
|
|
$query->where('join_pay_member_id', $memberId)
|
|
|
// ->whereIn('pay_prepayid', ['W06', 'A01'])
|
|
// ->whereIn('pay_prepayid', ['W06', 'A01'])
|
|
|
->where('pay_category', 'RECHARGE')
|
|
->where('pay_category', 'RECHARGE')
|
|
|
- ->where('pay_prepayid','<>','WELFARE')
|
|
|
|
|
|
|
+ ->where('pay_prepayid','<>',$memberId.'-WELFARE')
|
|
|
->where('pay_status', 'SUCCESS');
|
|
->where('pay_status', 'SUCCESS');
|
|
|
})->orWhere(function ($query) use ($memberId) {
|
|
})->orWhere(function ($query) use ($memberId) {
|
|
|
$query->where('join_pay_member_id', $memberId)
|
|
$query->where('join_pay_member_id', $memberId)
|
gorden