From 7f1b3e8c96bd2f46f50afdb1343776a124f866ff Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 30 May 2024 15:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=8F=90=E4=BE=9B=E6=9B=B4=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/RetailOrderController.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php
index 42af812..7cfabe1 100644
--- a/app/api/controller/order/RetailOrderController.php
+++ b/app/api/controller/order/RetailOrderController.php
@@ -181,8 +181,7 @@ class RetailOrderController extends BaseApiController
                         Redis::send('send-code-pay', ['number' => $order['number']]);
                         return $this->success('用户支付中');
                     }
-                    $result['create_time'] = $order['create_time'];
-                    return $this->success('', $result);
+                    return $this->success('支付成功', ['out_trade_no'=>$result['out_trade_no'],'pay_type'=>PayEnum::WECHAT_PAY_BARCODE,'transaction_id'=>$result['transaction_id']]);
                     break;
                 case  PayEnum::ALIPAY_BARCODE:
                     //支付宝条码支付
@@ -191,10 +190,10 @@ class RetailOrderController extends BaseApiController
                         return $this->fail(PaymentLogic::getError(), $params);
                     }
                     if ($result['msg'] !== 'Success') {
-                        return $this->success('用户支付中');
+                        return $this->success('用户支付中',[],1,1);
                     }
                     $result['create_time'] = $order['create_time'];
-                    return $this->success('', $result);
+                    return $this->success('支付成功', ['out_trade_no'=>$result['out_trade_no'],'pay_type'=>PayEnum::ALIPAY_BARCODE,'transaction_id'=>$result['trade_no']]);
                     break;
                 default:
                     return $this->fail('支付方式错误');
@@ -274,8 +273,7 @@ class RetailOrderController extends BaseApiController
                     Redis::send('send-code-pay', ['number' => $order['number']]);
                     return $this->success('用户支付中');
                 }
-                $result['create_time'] = $order['create_time'];
-                return $this->success('', $result);
+                return $this->success('支付成功', ['out_trade_no'=>$result['out_trade_no'],'pay_type'=>PayEnum::WECHAT_PAY_BARCODE,'transaction_id'=>$result['transaction_id']]);
                 break;
             case  PayEnum::ALIPAY_BARCODE:
                 //支付宝条码支付
@@ -286,8 +284,7 @@ class RetailOrderController extends BaseApiController
                 if ($result['msg'] !== 'Success') {
                     return $this->success('用户支付中');
                 }
-                $result['create_time'] = $order['create_time'];
-                return $this->success('', $result);
+                return $this->success('支付成功', ['out_trade_no'=>$result['out_trade_no'],'pay_type'=>PayEnum::ALIPAY_BARCODE,'transaction_id'=>$result['trade_no']]);
                 break;
             default:
                 return $this->fail('支付方式错误');