From 9f44216503bf7b828b7633fb1dde3cefebcdad33 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 8 Jun 2024 20:11:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(payment):=20=E4=BF=AE=E6=94=B9=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=80=9A=E7=9F=A5=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/controller/store_order/StoreOrderController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index adcb02640..842aca150 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -156,7 +156,7 @@ class StoreOrderController extends BaseAdminController
                         Log::error(json_encode($result));
                         PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result);
                     } 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('支付成功', ['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') {
                         return $this->success('用户支付中');
                     }
+                    PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result);
                     $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']]);
                 default:
@@ -211,10 +212,9 @@ class StoreOrderController extends BaseAdminController
                     return $this->fail(PaymentLogic::getError(), $params);
                 }
                 if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') {
-                    Log::error(json_encode($result));
                     PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result);
                 } 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('支付成功', ['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') {
                     return $this->success('用户支付中');
                 }
+                PayNotifyLogic::handle('alipay_cashier', $result['out_trade_no'], $result);
+
                 $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']]);
             default: