From ada2f459302d2d87be72d3ffc5554ba791e6a31f Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Thu, 18 Apr 2024 20:08:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=81=8C=E4=BD=8D=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/CommonConstants.java | 2 ++ .../java/com/cool/store/enums/UserRoleEnum.java | 16 ++++++++++++---- .../service/impl/JoinIntentionServiceImpl.java | 2 +- .../cool/store/service/impl/LineServiceImpl.java | 2 +- .../service/impl/UserAuthMappingServiceImpl.java | 10 +++++++++- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 581fdb936..3381705d3 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -151,6 +151,8 @@ public class CommonConstants { // 线索选择的意向区域没有绑定战区，线索分配给【拓展经理胡德龙】 // public static final String DEAULT_INVESTMENT_JOBNUMBER = "17021329"; public static final String DEAULT_INVESTMENT_JOBNUMBER = "020125244825417786"; + // public static final String DEAULT_SELECT_SITE_MANAGER = "09080211"; + public static final String DEAULT_SELECT_SITE_MANAGER = "020125244825417786"; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index e478f0025..dd3c3416a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -12,11 +12,19 @@ import java.util.stream.Collectors; * @date 2024-03-22 16:37 */ public enum UserRoleEnum { - - INVESTMENT_MANAGER(100000000L, "招商经理"), - SELECT_SITE_MANAGER(110000000L, "选址人员"), - REGION_MANAGER(120000000L, "大区经理"), + INVESTMENT_COMMISSIONER(100000000L, "招商专员"), + SELECT_SITE_COMMISSIONER(110000000L, "选址专员"), + REGION_MANAGER(120000000L, "大区执行总经理"), THEATER_MANAGER(130000000L, "战区经理"), + OPERATIONS_MANAGER(140000000L, "营运经理"), + TRAINER(150000000L, "训练"), + XFSG_CLERK(160000000L, "店员"), + XFSG_SHOPOWNER(170000000L, "店长"), + SUPERVISION(180000000L, "督导"), + SELECT_SITE_LEADER(190000000L, "选址组长"), + SELECT_SITE_MANAGER(200000000L, "选址经理"), + INVESTMENT_MANAGER(210000000L, "招商经理"), + HEADQUARTERS_LEADER(220000000L, "总部负责人"), ; private Long code; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index d566dd49a..8b703bf84 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -75,7 +75,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt } LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))){ - EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, Long.valueOf(request.getAreaCode())); + EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode())); lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); } //todo 目前写死为进入私海 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index e3a397167..d4b93e15c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -405,7 +405,7 @@ public class LineServiceImpl implements LineService { if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){ userId = addLineRequest.getInvestmentManagerUserId(); }else { - EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, addLineRequest.getWantShopAreaId()); + EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, addLineRequest.getWantShopAreaId()); userId = user.getUserId(); } Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index 92ee0ac3c..0d90a21e0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -125,12 +125,20 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { } private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) { - if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){ + // 如果找不到招商专员，则分配给默认的招商经理 + if(UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)){ EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER); if(defaultUser == null){ defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER); } return defaultUser; + }else if(UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)){ + // 如果找不到选址专员，则分配给默认的选址经理 + EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_SELECT_SITE_MANAGER); + if(defaultUser == null){ + defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_SELECT_SITE_MANAGER); + } + return defaultUser; } return null; } From 6050442f7599ab50939bca8000f11c0d5c806f52 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Thu, 18 Apr 2024 20:18:16 +0800 Subject: [PATCH 2/3] saveOrUpdateRegionAreaConfig --- .../java/com/cool/store/request/RegionAreaConfigAddRequest.java | 1 - .../com/cool/store/service/impl/RegionAreaConfigServiceImpl.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java index 343cff53a..b39533b1a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java @@ -21,7 +21,6 @@ public class RegionAreaConfigAddRequest { private Long regionId; @ApiModelProperty("省市集合") - @NotEmpty(message = "省市不能为空") private List areaIdList; } 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 c31989cac..2803aab9a 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 @@ -46,6 +46,7 @@ public class RegionAreaConfigServiceImpl implements RegionAreaConfigService { } List areaIdList = regionAreaConfigAddRequest.getAreaIdList(); if(CollectionUtils.isEmpty(areaIdList)){ + regionAreaConfigDao.deleteRegionAreaConfigByRegionId(regionAreaConfigAddRequest.getRegionId()); return Boolean.TRUE; } regionAreaConfigDao.deleteByWantShopAreaIds(areaIdList); From f21bb13a8e4c30a2233a8865c41a0321f3b2a963 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Thu, 18 Apr 2024 20:25:05 +0800 Subject: [PATCH 3/3] deleteRegionAreaConfigByRegionId --- .../cool/store/service/impl/RegionAreaConfigServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2803aab9a..b35dcf9d7 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 @@ -45,8 +45,8 @@ public class RegionAreaConfigServiceImpl implements RegionAreaConfigService { throw new ServiceException(ErrorCodeEnum.ONLY_WAR_REGION_CONFIG); } List areaIdList = regionAreaConfigAddRequest.getAreaIdList(); + regionAreaConfigDao.deleteRegionAreaConfigByRegionId(regionAreaConfigAddRequest.getRegionId()); if(CollectionUtils.isEmpty(areaIdList)){ - regionAreaConfigDao.deleteRegionAreaConfigByRegionId(regionAreaConfigAddRequest.getRegionId()); return Boolean.TRUE; } regionAreaConfigDao.deleteByWantShopAreaIds(areaIdList);