|
@@ -781,7 +781,7 @@ class WholeController extends Curd
|
|
|
$payDetails = PayDetail::where('join_pay_member_id',$params['join_order_member_id'])
|
|
$payDetails = PayDetail::where('join_pay_member_id',$params['join_order_member_id'])
|
|
|
->where('pay_status','SUCCESS')
|
|
->where('pay_status','SUCCESS')
|
|
|
->where('pay_prepayid',$params['join_order_member_id'].'-WELFARE')
|
|
->where('pay_prepayid',$params['join_order_member_id'].'-WELFARE')
|
|
|
- ->whereNotIn('pay_category',['SERVICE','CHNMED','CHNNCD','MEALS','DESHES','REFUND'])
|
|
|
|
|
|
|
+ ->whereNotIn('pay_category',['SERVICE','CHNMED','CHNNCD','MEALS','DESHES','REFUND','RECHARGE'])
|
|
|
->get()
|
|
->get()
|
|
|
->toArray();
|
|
->toArray();
|
|
|
|
|
|
|
@@ -1294,7 +1294,7 @@ class WholeController extends Curd
|
|
|
$payDetails = PayDetail::where('join_pay_member_id',$params['join_order_member_id'])
|
|
$payDetails = PayDetail::where('join_pay_member_id',$params['join_order_member_id'])
|
|
|
->where('pay_status','SUCCESS')
|
|
->where('pay_status','SUCCESS')
|
|
|
->where('pay_prepayid',$params['join_order_member_id'].'-WELFARE')
|
|
->where('pay_prepayid',$params['join_order_member_id'].'-WELFARE')
|
|
|
- ->whereNotIn('pay_category',['SERVICE','CHNMED','CHNNCD','MEALS','DESHES','REFUND'])
|
|
|
|
|
|
|
+ ->whereNotIn('pay_category',['SERVICE','CHNMED','CHNNCD','MEALS','DESHES','REFUND','RECHARGE'])
|
|
|
->get()
|
|
->get()
|
|
|
->toArray();
|
|
->toArray();
|
|
|
|
|
|
gorden