From d21130cbb89248dccc33d1f0dd61380d3908f795 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 8 May 2024 14:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/RetailOrderController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php
index 7a610f1..043ba2b 100644
--- a/app/api/controller/order/RetailOrderController.php
+++ b/app/api/controller/order/RetailOrderController.php
@@ -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);