From 044bb24b570c68f463a64bdb62a3d55c2c969310 Mon Sep 17 00:00:00 2001
From: xm <1350250847@qq.com>
Date: Thu, 30 Apr 2026 10:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=9A=E5=8A=A1=EF=BC=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9C=B0=E5=9D=80=E5=90=8C=E6=AD=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=9D=9E=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopUserAddressController.java |  7 ++----
 .../shop/service/ShopUserAddressService.java  |  7 ++++++
 .../impl/ShopUserAddressServiceImpl.java      | 24 +++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java
index e2290f9..9cc92fb 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java
@@ -79,11 +79,8 @@
         @OperationLog
         @Operation(summary = "修改收货地址")
         @PutMapping()
-        public ApiResult<?> update(@RequestBody ShopUserAddress shopUserAddress) {
-            if (shopUserAddressService.updateById(shopUserAddress)) {
-                return success("修改成功");
-            }
-            return fail("修改失败");
+        public ApiResult<Boolean> update(@RequestBody ShopUserAddress shopUserAddress) {
+            return success(shopUserAddressService.updateInfo(shopUserAddress));
         }
 
         @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')")
diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java b/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java
index 70880e4..d8ec530 100644
--- a/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java
@@ -55,4 +55,11 @@ public interface ShopUserAddressService extends IService<ShopUserAddress> {
      */
     List<ShopUserAddress> getUserAddresses(Integer userId);
 
+    /**
+     * 修改用户信息
+     * @param shopUserAddress
+     * @return
+     */
+    Boolean updateInfo(ShopUserAddress shopUserAddress);
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java
index cf599c6..69ade75 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java
@@ -8,8 +8,11 @@ import com.gxwebsoft.shop.entity.ShopUserAddress;
 import com.gxwebsoft.shop.param.ShopUserAddressParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -65,4 +68,25 @@ public class ShopUserAddressServiceImpl extends ServiceImpl<ShopUserAddressMappe
         return list(wrapper);
     }
 
+    @Override
+    @Transactional
+    public Boolean updateInfo(ShopUserAddress shopUserAddress) {
+        ShopUserAddress address = baseMapper.selectById(shopUserAddress.getId());
+        if(address != null){
+            if(shopUserAddress.getIsDefault()){
+                List<ShopUserAddress> list = lambdaQuery().eq(ShopUserAddress::getIsDefault, true).eq(ShopUserAddress::getUserId, address.getUserId())
+                        .ne(ShopUserAddress::getId, address.getId()).list();
+                if(CollectionUtils.isNotEmpty(list)){
+                    list.forEach(userAddress ->{
+                        userAddress.setIsDefault(false);
+                    });
+                }
+                updateBatchById(list);
+            }
+            shopUserAddress.setUpdateTime(LocalDateTime.now());
+            return baseMapper.updateById(shopUserAddress) > 0;
+        }
+        return false;
+    }
+
 }