From e1bd2a22ab03461fd88b4975f2fcc8ac9c639ba7 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Mon, 22 Apr 2024 14:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=A0=E9=99=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD(=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=9B=B4=E6=94=B9=E5=90=8E=E6=89=80=E6=9C=89=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/AddShopRequest.java | 4 ---- .../com/cool/store/service/impl/ShopServiceImpl.java | 12 +++++++++++- .../cool/store/controller/webb/PCShopController.java | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddShopRequest.java index e49a886e6..314ca6089 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddShopRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddShopRequest.java @@ -19,8 +19,4 @@ public class AddShopRequest { @ApiModelProperty("线索id") private Long lineId; - @NotBlank - @ApiModelProperty("店铺名称") - private String shopName; - } 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 10a7e5fb8..088e233fd 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 @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import com.cool.store.constants.CommonConstants; import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; @@ -94,6 +95,10 @@ public class ShopServiceImpl implements ShopService { @Override public Integer deleteShop(DeleteShopRequest request) { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + if(Objects.nonNull(shopInfo)){ + //进入选址不允许删除操作 + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_3); if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); @@ -117,10 +122,15 @@ public class ShopServiceImpl implements ShopService { if(Objects.isNull(lineInfo)){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + List shopList = shopInfoDAO.getShopList(request.getLineId()); + LineInfoDO updateLine = new LineInfoDO(); + updateLine.setId(request.getLineId()); + updateLine.setWantShopNum(shopList.size() + CommonConstants.ONE); + lineInfoDAO.updateLineInfo(updateLine); ShopInfoDO addShop = new ShopInfoDO(); addShop.setLineId(request.getLineId()); addShop.setPartnerId(lineInfo.getPartnerId()); - addShop.setShopName(request.getShopName()); + addShop.setShopName("店铺"+ NumberConverter.convertArabicToChinese(updateLine.getWantShopNum())); return shopInfoDAO.addShopInfo(addShop); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java index fcd6021d7..ad41bd3ba 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java @@ -1,6 +1,5 @@ package com.cool.store.controller.webb; -import com.cool.store.context.PartnerUserHolder; import com.cool.store.request.AddShopRequest; import com.cool.store.request.DeleteShopRequest; import com.cool.store.response.ResponseResult;