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 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);