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

feat(order): 修改订单支付逻辑与地址获取方式

Browse Source
This commit is contained in:
mkm 2024-06-08 20:47:30 +08:00
parent e6acf8b542
commit 6ba088cbda
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/controller/order/OrderController.php
View File

@ -306,12 +306,11 @@ class OrderController extends BaseApiController
//微信小程序支付 //微信小程序支付
$redirectUrl = $params['redirect'] ?? '/pages/payment/payment'; $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
if ($addressId != $order['address_id']) { if ($addressId != $order['address_id']) {
$address = UserAddress::where(['address_id' => $addressId, 'uid' => Request()->userId])->find(); $address = UserAddress::where(['id' => $addressId, 'uid' => Request()->userId])->find();
if ($address) { if ($address) {
$_order['real_name'] = $address['real_name']; $_order['real_name'] = $address['real_name'];
$_order['user_phone'] = $address['phone']; $_order['user_phone'] = $address['phone'];
$_order['user_address'] = $address['detail']; $_order['user_address'] = $address['detail'];
$_order['address_id'] = $addressId;
StoreOrder::where(['id' => $order_id, 'uid' => Request()->userId])->update($_order); StoreOrder::where(['id' => $order_id, 'uid' => Request()->userId])->update($_order);
} }
} }

2
app/common/logic/PaymentLogic.php
View File

@ -43,7 +43,7 @@ class PaymentLogic extends BaseLogic
$order['pay_price'] = $order['price']; $order['pay_price'] = $order['price'];
} }
switch ($payWay) { switch ($payWay) {
case PayEnum::WECHAT_PAY: case PayEnum::WECHAT_PAY_MINI:
$auth = UserAuth::where(['user_id' => $order['uid'], 'terminal' => $terminal])->findOrEmpty(); $auth = UserAuth::where(['user_id' => $order['uid'], 'terminal' => $terminal])->findOrEmpty();
$order = [ $order = [
'out_trade_no' => $paySn, 'out_trade_no' => $paySn,