mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-08 14:39:37 +08:00
parent 61b8d1bd10
commit d21130cbb8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/order/RetailOrderController.php
View File

@ -135,14 +135,14 @@ class RetailOrderController extends BaseApiController
} }
}elseif($pay_type==PayEnum::WECHAT_PAY){ }elseif($pay_type==PayEnum::WECHAT_PAY){
$redirectUrl = $params['redirect'] ?? '/pages/payment/payment'; $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
if($addressId>0){ if($addressId!=$order['address_id']){
$address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find(); $address=UserAddress::where(['address_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; $_order['address_id'] = $addressId;
$order=Cashierclass::where(['id'=>$order_id,'uid'=>Request()->userId])->update($_order); Cashierclass::where(['id'=>$order_id,'uid'=>Request()->userId])->update($_order);
} }
} }
$result = PaymentLogic::pay($pay_type,'cashierclass', $order, $this->userInfo['terminal'], $redirectUrl); $result = PaymentLogic::pay($pay_type,'cashierclass', $order, $this->userInfo['terminal'], $redirectUrl);