From abfad1f11d819a397f592eb860e3eb83a4d08fb4 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Wed, 12 Feb 2025 18:45:37 +0800
Subject: [PATCH] fix addBranchShop

---
 .../cool/store/service/impl/ShopServiceImpl.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 9d270783d..092ae3464 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
@@ -263,12 +263,19 @@ public class ShopServiceImpl implements ShopService {
         }
         ShopInfoDO shopInfoDO = request.toDO(request, lineInfo);
         List<ShopInfoDO> shopList = shopInfoDAO.getShopList(lineInfo.getId());
+        if(StringUtils.isBlank(request.getShopName())){
+            if (CollectionUtils.isNotEmpty(shopList)) {
+                shopInfoDO.setShopName("店铺"+NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum() + 1));
+            }else{
+                shopInfoDO.setShopName("店铺"+NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum()));
+            }
+        }else{
+            shopInfoDO.setShopName(request.getShopName());
+        }
+
         if (CollectionUtils.isNotEmpty(shopList)) {
-            shopInfoDO.setShopName("店铺"+NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum() + 1));
             lineInfo.setWantShopNum(lineInfo.getWantShopNum() + 1);
             lineInfoDAO.updateLineInfo(lineInfo);
-        }else {
-            shopInfoDO.setShopName("店铺"+NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum()));
         }
         shopInfoDO.setCreateUserId(userId);
         Long shopId = shopInfoDAO.addShopInfo(shopInfoDO);