From a5c66d1c57480c0cb69ed43166edb31a74412a8d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 25 Jun 2025 15:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=97=A8=E5=BA=97=E5=8A=A0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../store/service/impl/ShopServiceImpl.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 7f25c923e..6caf463d7 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -265,6 +265,7 @@ public enum ErrorCodeEnum { SHOP_HAVE_NOT_OVER_ACCORDING(1511014,"该加盟商下有未结束跟进的门店，请先结束门店",null), MOBILE_NOT_EXIST(151016,"手机号不存在，请先维护手机号！",null), + IS_EXIST_CLAIM(1511018,"存在已认领的账单，不能删除门店",null), API_CALL_ERROR(1511020,"接口调用错误",null), ADD_PAY_INFO_FAIL(1511021,"添加缴费信息失败",null), UPDATE_ERROR(1511022,"修改信息失败",null), 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 caa1877dd..c905af0f9 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 @@ -34,6 +34,7 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -59,6 +60,8 @@ import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; @Slf4j public class ShopServiceImpl implements ShopService { + @Resource + private LinePayDAO linePayDAO; @Resource private OldShopDAO oldShopDAO; @Value("${mybatis.configuration.variables.enterpriseId}") @@ -231,10 +234,16 @@ public class ShopServiceImpl implements ShopService { // //进入选址不允许删除操作 // 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); -// } + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_7); + if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ + throw new ServiceException(ErrorCodeEnum.IS_EXIST_CLAIM); + } + List franchiseFeePayInfoByShopId = linePayDAO.getFranchiseFeePayInfoByShopId(request.getShopId()); + if (ListUtils.emptyIfNull(franchiseFeePayInfoByShopId) + .stream() + .anyMatch(lineInfoDO->lineInfoDO.getXgjClaimStatus().equals(ClaimStatusEnum.CLAIMED.getCode()))){ + throw new ServiceException(ErrorCodeEnum.IS_EXIST_CLAIM); + } // if (Objects.nonNull(shopInfo.getPointId())) { // PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); // if (Objects.nonNull(pointInfo) && SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {