From 5ceb6371b973e01ab0187431b3ac618f1e6b4ff2 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Tue, 9 Apr 2024 15:32:47 +0800 Subject: [PATCH] ONLY_WAR_REGION_CONFIG --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../src/main/resources/mapper/RegionMapper.xml | 3 ++- .../cool/store/service/impl/RegionAreaConfigServiceImpl.java | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) 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 5e44ab792..0d2570ee4 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 @@ -135,6 +135,7 @@ public enum ErrorCodeEnum { OPEN_AREA_IS_NOT_EXISTS(107006, "意向区域城市不存在", null), REGION_NOT_EXIST(108001, "区域不存在",null), + ONLY_WAR_REGION_CONFIG(108002, "意向省市只能配置到战区",null), NOT_APPROVE_NODE(109001, "不是审批节点",null), ; diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml index 8371ef812..339ca094f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml @@ -117,7 +117,8 @@ region_type as regionType, region_path as regionPath, deleted, - store_num as storeNum + store_num as storeNum, + third_region_type as thirdRegionType from region_${enterpriseId} where id = #{regionId} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java index 1ee2a9dc4..c31989cac 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java @@ -6,6 +6,7 @@ import com.cool.store.dao.RegionDao; import com.cool.store.entity.RegionAreaConfigDO; import com.cool.store.entity.RegionDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.ThirdRegionTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.RegionAreaConfigAddRequest; import com.cool.store.service.RegionAreaConfigService; @@ -40,6 +41,9 @@ public class RegionAreaConfigServiceImpl implements RegionAreaConfigService { if(regionDO == null){ throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); } + if(!ThirdRegionTypeEnum.WAR_REGION.getCode().equals(regionDO.getThirdRegionType())){ + throw new ServiceException(ErrorCodeEnum.ONLY_WAR_REGION_CONFIG); + } List areaIdList = regionAreaConfigAddRequest.getAreaIdList(); if(CollectionUtils.isEmpty(areaIdList)){ return Boolean.TRUE;