更新
This commit is contained in:
parent
61b8d1bd10
commit
d21130cbb8
@ -135,14 +135,14 @@ class RetailOrderController extends BaseApiController
|
||||
}
|
||||
}elseif($pay_type==PayEnum::WECHAT_PAY){
|
||||
$redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
|
||||
if($addressId>0){
|
||||
if($addressId!=$order['address_id']){
|
||||
$address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find();
|
||||
if($address){
|
||||
$_order['real_name'] = $address['real_name'];
|
||||
$_order['user_phone'] = $address['phone'];
|
||||
$_order['user_address'] = $address['detail'];
|
||||
$_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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user