From 8d61d5e01599582e87360b5129d0b1dbcd6d7537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Mon, 18 Aug 2025 09:34:55 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/service/impl/ShopServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 1046f8d18..0a9d22afc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -434,13 +434,15 @@ public class ShopServiceImpl implements ShopService {
     @Override
     public Integer updateBranchShopDetail(BranchShopDetailRequest request, String userId) {
         //检验门店编码是否重复
-        if(this.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){
+        if(StringUtils.isNotEmpty(request.getShopCode())&&this.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){
             throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST);
         }
         ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
         shopInfo.setUpdateUserId(userId);
         shopInfo.setUpdateTime(new Date());
-        shopInfo.setShopCode(request.getShopCode().trim());
+        if (StringUtils.isNotEmpty(request.getShopCode())){
+            shopInfo.setShopCode(request.getShopCode().trim());
+        }
         shopInfo.setShopName(request.getShopName());
         shopInfo.setWantShopAreaId(request.getWantShopAreaId());
         shopInfo.setRegionId(request.getRegionId());