From 8d0d8ab603e47323a07977c89b256d2493a8b113 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 17 Jun 2024 18:03:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF=EF=BC=8C?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95id?=
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, 4 insertions(+), 4 deletions(-)
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index e09ce0c47..024cb88af 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -205,7 +205,7 @@ class StoreOrderController extends BaseAdminController
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']]);
+ return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'],'id'=>$order['id']]);
case PayEnum::ALIPAY_BARCODE:
//支付宝条码支付
$result = PaymentLogic::ali_auth_code($auth_code, $order);
@@ -217,7 +217,7 @@ class StoreOrderController extends BaseAdminController
}
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']]);
+ return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'],'id'=>$order['id']]);
default:
return $this->fail('支付方式错误');
}
@@ -266,7 +266,7 @@ class StoreOrderController extends BaseAdminController
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']]);
+ return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id'],'id'=>$order['id']]);
case PayEnum::ALIPAY_BARCODE:
//支付宝条码支付
$result = PaymentLogic::ali_auth_code($auth_code, $order);
@@ -279,7 +279,7 @@ class StoreOrderController extends BaseAdminController
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']]);
+ return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::ALIPAY_BARCODE, 'transaction_id' => $result['trade_no'],'id'=>$order['id']]);
default:
return $this->fail('支付方式错误');
}