|
|
@@ -975,7 +975,6 @@ class WholeController extends Curd
|
|
|
return json_fail("支付信息异常异常");
|
|
|
}
|
|
|
|
|
|
- $payType = explode('-', $payDetail->pay_prepayid);
|
|
|
|
|
|
$res = '[]';
|
|
|
$data = '[]';
|
|
|
@@ -988,7 +987,7 @@ class WholeController extends Curd
|
|
|
$return->order_return_refund_json = json_encode(['amount'=>$amount]);
|
|
|
$return->save();
|
|
|
// 区分账户余额支付和通联支付
|
|
|
- if (isset($payType[1]) && in_array($payType[1], ['W06', 'A01'])) {
|
|
|
+ if (in_array($payDetail->pay_prepayid, ['W06', 'A01'])) {
|
|
|
$responseJson = [];
|
|
|
if (!empty($payDetail->pay_json_response)) {
|
|
|
$responseJson = json_decode($payDetail->pay_json_response, true);
|
|
|
@@ -1015,6 +1014,7 @@ class WholeController extends Curd
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $payType = explode('-', $payDetail->pay_prepayid);
|
|
|
// 余额支付
|
|
|
if (isset($payType[1]) && $payType[1] == 'CASH') {
|
|
|
$account = MemberAccount::where('join_account_member_id', $order->join_order_member_id)
|
|
|
@@ -1035,7 +1035,7 @@ class WholeController extends Curd
|
|
|
]);
|
|
|
}
|
|
|
// 卡支付
|
|
|
- if (count($payType) == 1) {
|
|
|
+ if (count($payType) == 1 && !in_array($payDetail->pay_prepayid, ['W06', 'A01'])) {
|
|
|
$account = MemberAccount::where('join_account_member_id', $order->join_order_member_id)
|
|
|
->where('member_account_nbr', $payType[0])
|
|
|
->where('member_account_classify', 'CARD')
|
gorden