mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(payment): 修改支付通知处理逻辑

Browse Source
This commit is contained in:
mkm 2024-06-08 20:11:53 +08:00
parent 68336add58
commit 9f44216503
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/store/controller/store_order/StoreOrderController.php
View File

@ -156,7 +156,7 @@ class StoreOrderController extends BaseAdminController
Log::error(json_encode($result)); Log::error(json_encode($result));
PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result); PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result);
} else { } else {
Redis::send('send-code-pay', ['number' => $order['number']]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]);
return $this->success('用户支付中'); return $this->success('用户支付中');
} }
return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]);
@ -169,6 +169,7 @@ class StoreOrderController extends BaseAdminController
if ($result['msg'] !== 'Success') { if ($result['msg'] !== 'Success') {
return $this->success('用户支付中'); return $this->success('用户支付中');
} }
PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result);
$result['create_time'] = $order['create_time']; $result['create_time'] = $order['create_time'];
return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]);
default: default:
@ -211,10 +212,9 @@ class StoreOrderController extends BaseAdminController
return $this->fail(PaymentLogic::getError(), $params); return $this->fail(PaymentLogic::getError(), $params);
} }
if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') {
Log::error(json_encode($result));
PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result); PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result);
} else { } else {
Redis::send('send-code-pay', ['number' => $order['number']]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]);
return $this->success('用户支付中'); return $this->success('用户支付中');
} }
return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]); return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]);
@ -227,6 +227,8 @@ class StoreOrderController extends BaseAdminController
if ($result['msg'] !== 'Success') { if ($result['msg'] !== 'Success') {
return $this->success('用户支付中'); return $this->success('用户支付中');
} }
PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result);
$result['create_time'] = $order['create_time']; $result['create_time'] = $order['create_time'];
return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]); return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no']]);
default: default: