From 0acb2dbea18952699a2bcf7fbf838cf2a4f994e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 15 May 2025 16:47:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=E6=84=8F=E5=90=91=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dto/UserDTO.java | 8 +++++ .../com/cool/store/service/ShopService.java | 10 ++++++ .../store/service/impl/ShopServiceImpl.java | 34 +++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/UserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/UserDTO.java index 5ea097c6e..e78d6bef1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/UserDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/UserDTO.java @@ -17,4 +17,12 @@ public class UserDTO { private String name; @ApiModelProperty(value = "手机号") private String mobile; + + public UserDTO() { + } + + public UserDTO(String name, String mobile) { + this.name = name; + this.mobile = mobile; + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 9c5f1548f..458afd560 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.dto.UserDTO; import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.request.*; @@ -113,4 +114,13 @@ public interface ShopService { String getFranchiseBrandName(Long shopId); //处理shop表省市区 Integer dateHandler(Integer pageNum, Integer pageSize); + + + /** + * 获取意向阶段处理人 + * @param lineId + * @param subStage + * @return + */ + List getIntendSubStageHandle(Long lineId,Integer subStage); } 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 d12f1509e..9466c6e35 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 @@ -7,6 +7,7 @@ import com.cool.store.dto.Preparation.PreparationDTO; import com.cool.store.dto.Preparation.ScheduleDTO; import com.cool.store.dto.RegionNode; import com.cool.store.dto.ShopNameAndCodeDTO; +import com.cool.store.dto.UserDTO; import com.cool.store.dto.openPreparation.PlanLineDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; @@ -45,6 +46,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import static com.cool.store.enums.ErrorCodeEnum.UPDATE_INVESTMENT_MANAGER_FAIL; +import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; /** * @author zhangchenbiao @@ -672,5 +674,37 @@ public class ShopServiceImpl implements ShopService { return shopInfoDAO.updateShopCity(shopList); } + @Override + public List getIntendSubStageHandle(Long lineId,Integer subStage) { + //查询线索 + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); + List userList = new ArrayList<>(); + //如果阶段对应不上 直接返回空 + if(lineInfo.getWorkflowSubStage().equals(subStage)){ + return userList; + } + //加盟商处理时子阶段状态 + List intendPartnerList = Arrays.asList(INTENT_0.getCode(), PAY_DEPOSIT_45.getCode()); + if (intendPartnerList.contains(lineInfo.getWorkflowSubStageStatus())){ + UserDTO userDTO = new UserDTO(lineInfo.getUsername(), lineInfo.getMobile()); + userList.add(userDTO); + return userList; + } + //督导处理阶段 + List intendManagerList = Arrays.asList(INTENT_5.getCode(), PAY_DEPOSIT_50.getCode(),SIGN_INTENT_AGREEMENT_70.getCode()); + if (intendManagerList.contains(lineInfo.getWorkflowSubStageStatus())){ + EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); + if (Objects.nonNull(userInfo)){ + UserDTO userDTO = new UserDTO(userInfo.getName(), userInfo.getMobile()); + userList.add(userDTO); + } + return userList; + } + return userList; + } + + + + } From eb9c69f82ee66f0e0b2da8964a153f7ca6c485e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 16 May 2025 14:40:40 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/ShopService.java | 9 ++ .../store/service/impl/ShopServiceImpl.java | 109 +++++++++++++++++- 2 files changed, 115 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 458afd560..5319f5279 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -123,4 +123,13 @@ public interface ShopService { * @return */ List getIntendSubStageHandle(Long lineId,Integer subStage); + + + /** + * 获取子阶段处理人数据 + * @param shopId + * @param subStage + * @return + */ + List getSubStageHandle(Long shopId,Integer subStage); } 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 9466c6e35..258214cb6 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 @@ -45,7 +45,8 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static com.cool.store.enums.ErrorCodeEnum.UPDATE_INVESTMENT_MANAGER_FAIL; +import static com.cool.store.enums.ErrorCodeEnum.*; +import static com.cool.store.enums.UserRoleEnum.*; import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; /** @@ -702,9 +703,111 @@ public class ShopServiceImpl implements ShopService { } return userList; } + @Resource + DecorationMeasureDAO decorationMeasureDAO; + @Resource + DecorationDesignInfoDAO decorationDesignInfoDAO; - - + @Override + public List getSubStageHandle(Long shopId, Integer subStage) { + if (shopId==null||subStage==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + DecorationMeasureDO measureDO = decorationMeasureDAO.getByShopId(shopId); + DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(shopId); + ShopStageInfoDO stage = shopStageInfoDAO.getByShopIdAndSubStage(shopId, subStage); + ShopSubStageStatusEnum shopSubStageStatusEnum = ShopSubStageStatusEnum.getShopSubStageStatusEnum(stage.getShopSubStageStatus()); + List userList = new ArrayList<>(); + switch (shopSubStageStatusEnum){ + case SHOP_SUB_STAGE_STATUS_10: + case SHOP_SUB_STAGE_STATUS_20: + case SHOP_SUB_STAGE_STATUS_22: + case SHOP_SUB_STAGE_STATUS_30: + case SHOP_SUB_STAGE_STATUS_40: + case SHOP_SUB_STAGE_STATUS_50: + case SHOP_SUB_STAGE_STATUS_71: + case SHOP_SUB_STAGE_STATUS_74: + case SHOP_SUB_STAGE_STATUS_905: + case SHOP_SUB_STAGE_STATUS_121: + userList.add(new UserDTO(lineInfo.getUsername(), lineInfo.getMobile())); + return userList; + case SHOP_SUB_STAGE_STATUS_11: + case SHOP_SUB_STAGE_STATUS_21: + case SHOP_SUB_STAGE_STATUS_110: + case SHOP_SUB_STAGE_STATUS_111: + case SHOP_SUB_STAGE_STATUS_122: + EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); + if (Objects.nonNull(userInfo)){ + userList.add(new UserDTO(userInfo.getName(), userInfo.getMobile())); + } + return userList; + case SHOP_SUB_STAGE_STATUS_70: + case SHOP_SUB_STAGE_STATUS_80: + case SHOP_SUB_STAGE_STATUS_85: + List userDOList1 = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(REGION_OFFICE, JOIN_OFFICE), shopInfo.getRegionId()); + userDOList1.forEach(x->{ + userList.add(new UserDTO(x.getName(), x.getMobile())); + }); + case SHOP_SUB_STAGE_STATUS_72: + case SHOP_SUB_STAGE_STATUS_83: + List userDOList2 = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(REGION_OFFICE, BRANCH_OFFICE), shopInfo.getRegionId()); + userDOList2.forEach(x->{ + userList.add(new UserDTO(x.getName(), x.getMobile())); + }); + case SHOP_SUB_STAGE_STATUS_85_1: + //财务 + SysRoleRequest sysRoleRequest = new SysRoleRequest(); + sysRoleRequest.setRoleName(FINANCE.getDesc()); + List userListByRole = userAuthMappingService.findUserListByRole(sysRoleRequest); + userListByRole.forEach(x->{ + userList.add(new UserDTO(x.getName(), x.getMobile())); + }); + case SHOP_SUB_STAGE_STATUS_861: + //财务 + SysRoleRequest req = new SysRoleRequest(); + req.setRoleName(CONSTRUCTION_CUSTOMER.getDesc()); + List userListByRole1 = userAuthMappingService.findUserListByRole(req); + userListByRole1.forEach(x->{ + userList.add(new UserDTO(x.getName(), x.getMobile())); + }); + case SHOP_SUB_STAGE_STATUS_862: + EnterpriseUserDO measureUser = enterpriseUserDAO.getUserInfoById(measureDO.getMeasureUserId()); + if (Objects.nonNull(measureUser)){ + userList.add(new UserDTO(measureUser.getName(), measureUser.getMobile())); + } + return userList; + case SHOP_SUB_STAGE_STATUS_90: + EnterpriseUserDO designLeaderUser = enterpriseUserDAO.getUserInfoById(decoration.getDesignLeaderId()); + if (Objects.nonNull(designLeaderUser)){ + userList.add(new UserDTO(designLeaderUser.getName(), designLeaderUser.getMobile())); + } + return userList; + case SHOP_SUB_STAGE_STATUS_901: + EnterpriseUserDO designUser = enterpriseUserDAO.getUserInfoById(decoration.getDesignUserId()); + if (Objects.nonNull(designUser)){ + userList.add(new UserDTO(designUser.getName(), designUser.getMobile())); + } + return userList; + case SHOP_SUB_STAGE_STATUS_902: + SysRoleRequest quotationReq = new SysRoleRequest(); + quotationReq.setRoleName(QUOTATION_OFFICE.getDesc()); + List userListByRole2 = userAuthMappingService.findUserListByRole(quotationReq); + userListByRole2.forEach(x->{ + userList.add(new UserDTO(x.getName(), x.getMobile())); + }); + return userList; + case SHOP_SUB_STAGE_STATUS_903: + EnterpriseUserDO quotationDesignUser = enterpriseUserDAO.getUserInfoById(decoration.getQuotationUserId()); + if (Objects.nonNull(quotationDesignUser)){ + userList.add(new UserDTO(quotationDesignUser.getName(), quotationDesignUser.getMobile())); + } + return userList; + default: + return userList; + } + } } From a69354a5cd9851b845c8df7e70dc0258a035125a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 16 May 2025 16:37:36 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/ShopServiceImpl.java | 201 ++++++++++++------ .../controller/webb/PCShopController.java | 17 ++ 2 files changed, 153 insertions(+), 65 deletions(-) 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 258214cb6..cc4ac5b95 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 @@ -101,6 +101,10 @@ public class ShopServiceImpl implements ShopService { HyPartnerUserInfoDAO hyPartnerUserInfoDAO; @Resource StoreDao storeDao; + @Resource + DecorationMeasureDAO decorationMeasureDAO; + @Resource + DecorationDesignInfoDAO decorationDesignInfoDAO; @Override @@ -703,24 +707,25 @@ public class ShopServiceImpl implements ShopService { } return userList; } - @Resource - DecorationMeasureDAO decorationMeasureDAO; - @Resource - DecorationDesignInfoDAO decorationDesignInfoDAO; + @Override public List getSubStageHandle(Long shopId, Integer subStage) { - if (shopId==null||subStage==null){ + // 参数校验 + if (shopId == null || subStage == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } + + // 基础数据 ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); DecorationMeasureDO measureDO = decorationMeasureDAO.getByShopId(shopId); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(shopId); ShopStageInfoDO stage = shopStageInfoDAO.getByShopIdAndSubStage(shopId, subStage); - ShopSubStageStatusEnum shopSubStageStatusEnum = ShopSubStageStatusEnum.getShopSubStageStatusEnum(stage.getShopSubStageStatus()); - List userList = new ArrayList<>(); - switch (shopSubStageStatusEnum){ + ShopSubStageStatusEnum statusEnum = ShopSubStageStatusEnum.getShopSubStageStatusEnum(stage.getShopSubStageStatus()); + + // Handle each status case + switch (statusEnum) { case SHOP_SUB_STAGE_STATUS_10: case SHOP_SUB_STAGE_STATUS_20: case SHOP_SUB_STAGE_STATUS_22: @@ -731,83 +736,149 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_74: case SHOP_SUB_STAGE_STATUS_905: case SHOP_SUB_STAGE_STATUS_121: - userList.add(new UserDTO(lineInfo.getUsername(), lineInfo.getMobile())); - return userList; + case SHOP_SUB_STAGE_STATUS_150: + case SHOP_SUB_STAGE_STATUS_180: + case SHOP_SUB_STAGE_STATUS_182: + case SHOP_SUB_STAGE_STATUS_190: + case SHOP_SUB_STAGE_STATUS_194: + case SHOP_SUB_STAGE_STATUS_200: + case SHOP_SUB_STAGE_STATUS_202: + case SHOP_SUB_STAGE_STATUS_210: + case SHOP_SUB_STAGE_STATUS_214: + case SHOP_SUB_STAGE_STATUS_220: + case SHOP_SUB_STAGE_STATUS_222: + return Collections.singletonList(new UserDTO(lineInfo.getUsername(), lineInfo.getMobile())); + case SHOP_SUB_STAGE_STATUS_11: case SHOP_SUB_STAGE_STATUS_21: case SHOP_SUB_STAGE_STATUS_110: case SHOP_SUB_STAGE_STATUS_111: case SHOP_SUB_STAGE_STATUS_122: - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); - if (Objects.nonNull(userInfo)){ - userList.add(new UserDTO(userInfo.getName(), userInfo.getMobile())); - } - return userList; + case SHOP_SUB_STAGE_STATUS_140: + case SHOP_SUB_STAGE_STATUS_141: + case SHOP_SUB_STAGE_STATUS_142: + return getUserFromInvestmentManager(lineInfo); + case SHOP_SUB_STAGE_STATUS_70: case SHOP_SUB_STAGE_STATUS_80: case SHOP_SUB_STAGE_STATUS_85: - List userDOList1 = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(REGION_OFFICE, JOIN_OFFICE), shopInfo.getRegionId()); - userDOList1.forEach(x->{ - userList.add(new UserDTO(x.getName(), x.getMobile())); - }); + return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, JOIN_OFFICE), shopInfo.getRegionId()); + case SHOP_SUB_STAGE_STATUS_72: case SHOP_SUB_STAGE_STATUS_83: - List userDOList2 = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(REGION_OFFICE, BRANCH_OFFICE), shopInfo.getRegionId()); - userDOList2.forEach(x->{ - userList.add(new UserDTO(x.getName(), x.getMobile())); - }); + return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, BRANCH_OFFICE), shopInfo.getRegionId()); + case SHOP_SUB_STAGE_STATUS_85_1: - //财务 - SysRoleRequest sysRoleRequest = new SysRoleRequest(); - sysRoleRequest.setRoleName(FINANCE.getDesc()); - List userListByRole = userAuthMappingService.findUserListByRole(sysRoleRequest); - userListByRole.forEach(x->{ - userList.add(new UserDTO(x.getName(), x.getMobile())); - }); + return getUsersByRole(FINANCE); + case SHOP_SUB_STAGE_STATUS_861: - //财务 - SysRoleRequest req = new SysRoleRequest(); - req.setRoleName(CONSTRUCTION_CUSTOMER.getDesc()); - List userListByRole1 = userAuthMappingService.findUserListByRole(req); - userListByRole1.forEach(x->{ - userList.add(new UserDTO(x.getName(), x.getMobile())); - }); + return getUsersByRole(CONSTRUCTION_CUSTOMER); + case SHOP_SUB_STAGE_STATUS_862: - EnterpriseUserDO measureUser = enterpriseUserDAO.getUserInfoById(measureDO.getMeasureUserId()); - if (Objects.nonNull(measureUser)){ - userList.add(new UserDTO(measureUser.getName(), measureUser.getMobile())); - } - return userList; + return getUserById(measureDO.getMeasureUserId()); + case SHOP_SUB_STAGE_STATUS_90: - EnterpriseUserDO designLeaderUser = enterpriseUserDAO.getUserInfoById(decoration.getDesignLeaderId()); - if (Objects.nonNull(designLeaderUser)){ - userList.add(new UserDTO(designLeaderUser.getName(), designLeaderUser.getMobile())); - } - return userList; + return getUserById(decoration.getDesignLeaderId()); + case SHOP_SUB_STAGE_STATUS_901: - EnterpriseUserDO designUser = enterpriseUserDAO.getUserInfoById(decoration.getDesignUserId()); - if (Objects.nonNull(designUser)){ - userList.add(new UserDTO(designUser.getName(), designUser.getMobile())); - } - return userList; + return getUserById(decoration.getDesignUserId()); + case SHOP_SUB_STAGE_STATUS_902: - SysRoleRequest quotationReq = new SysRoleRequest(); - quotationReq.setRoleName(QUOTATION_OFFICE.getDesc()); - List userListByRole2 = userAuthMappingService.findUserListByRole(quotationReq); - userListByRole2.forEach(x->{ - userList.add(new UserDTO(x.getName(), x.getMobile())); - }); - return userList; + return getUsersByRole(QUOTATION_OFFICE); + case SHOP_SUB_STAGE_STATUS_903: - EnterpriseUserDO quotationDesignUser = enterpriseUserDAO.getUserInfoById(decoration.getQuotationUserId()); - if (Objects.nonNull(quotationDesignUser)){ - userList.add(new UserDTO(quotationDesignUser.getName(), quotationDesignUser.getMobile())); - } - return userList; + return getUserById(decoration.getQuotationUserId()); + + case SHOP_SUB_STAGE_STATUS_151: + return getUsersByRoleAndRegion(UserRoleEnum.LOGISTICS, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_152: + UserRoleEnum financeRole = JoinModeEnum.OWN_STORE.equals(shopInfo.getJoinMode()) + ? UserRoleEnum.OWN_SHOP_OFFICE + : UserRoleEnum.FINANCE; + return getUsersByRole(financeRole); + + case SHOP_SUB_STAGE_STATUS_153: + return getUsersByRolesAndRegion(Arrays.asList(HEAD_OF_DIVISION, REGIONAL_MANAGER), shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_154: + return getUsersByRoleAndRegion(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_155: + return getUsersByRoleAndRegion(UserRoleEnum.PRESIDENT, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_160: + case SHOP_SUB_STAGE_STATUS_170: + return getUsersByRoleAndRegion(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_230: + return getUsersByRoleAndRegion(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_240: + return getUsersByRoleAndRegion(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_181: + return getUsersByRoleAndRegion(DOU_YIN_CUSTOMER, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_191: + case SHOP_SUB_STAGE_STATUS_193: + return getUsersByRoleAndRegion(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_201: + return getUsersByRoleAndRegion(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_211: + case SHOP_SUB_STAGE_STATUS_213: + return getUsersByRoleAndRegion(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, shopInfo.getRegionId()); + + case SHOP_SUB_STAGE_STATUS_221: + return getUsersByRoleAndRegion(UserRoleEnum.KUAI_SHOU_CUSTOMER, shopInfo.getRegionId()); + default: - return userList; + return Collections.emptyList(); } } + /** + * 获取招商经理信息 + * @param lineInfo + * @return + */ + private List getUserFromInvestmentManager(LineInfoDO lineInfo) { + EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); + if (userInfo != null) { + return Collections.singletonList(new UserDTO(userInfo.getName(), userInfo.getMobile())); + } + return Collections.emptyList(); + } + + private List getUserById(String userId) { + EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(userId); + if (user != null) { + return Collections.singletonList(new UserDTO(user.getName(), user.getMobile())); + } + return Collections.emptyList(); + } + + private List getUsersByRole(UserRoleEnum role) { + SysRoleRequest request = new SysRoleRequest(); + request.setRoleName(role.getDesc()); + return convertToUserDTOs(userAuthMappingService.findUserListByRole(request)); + } + + private List getUsersByRoleAndRegion(UserRoleEnum role, Long regionId) { + return convertToUserDTOs(userAuthMappingService.getAllUserByRoleEnumAndRegionId(role, regionId)); + } + + private List getUsersByRolesAndRegion(List roles, Long regionId) { + return convertToUserDTOs(userAuthMappingService.getUserIdByRoleEnumAndRegionId(roles, regionId)); + } + + private List convertToUserDTOs(List users) { + return users.stream() + .map(user -> new UserDTO(user.getName(), user.getMobile())) + .collect(Collectors.toList()); + } + } 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 61ba9d6af..bb7b60f72 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 @@ -2,6 +2,7 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.dto.TransferLogDTO; +import com.cool.store.dto.UserDTO; import com.cool.store.request.*; import com.cool.store.response.BranchShopDetailResponse; import com.cool.store.response.BranchShopResponse; @@ -135,4 +136,20 @@ public class PCShopController { public ResponseResult dateHandler(@RequestParam("pageSize")Integer pageSize,@RequestParam("pageNum")Integer pageNum) { return ResponseResult.success(shopService.dateHandler(pageNum,pageSize)); } + + + @ApiOperation("获取意向阶段处理人信息") + @GetMapping("/getIntendSubStageHandle") + public ResponseResult> getIntendSubStageHandle(@RequestParam("lineId")Long lineId, + @RequestParam("subStage")Integer subStage) { + return ResponseResult.success(shopService.getIntendSubStageHandle(lineId,subStage)); + } + + + @ApiOperation("获取筹建阶段处理人信息") + @GetMapping("/getSubStageHandle") + public ResponseResult> getSubStageHandle(@RequestParam("lineId")Long shopId, + @RequestParam("subStage")Integer subStage) { + return ResponseResult.success(shopService.getSubStageHandle(shopId,subStage)); + } } From 664012b97ebc0e46f0021a697e4dbd274f254aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 16 May 2025 17:09:02 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/ShopServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 cc4ac5b95..07b6c5c58 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 @@ -875,8 +875,10 @@ public class ShopServiceImpl implements ShopService { } private List convertToUserDTOs(List users) { + //最多给10条数据 return users.stream() .map(user -> new UserDTO(user.getName(), user.getMobile())) + .limit(10) .collect(Collectors.toList()); } From 009e639c23ba76403981b1a1a266237db9f3ef52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 16 May 2025 17:31:30 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/ShopServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 07b6c5c58..3b30707ce 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 @@ -685,7 +685,7 @@ public class ShopServiceImpl implements ShopService { LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); List userList = new ArrayList<>(); //如果阶段对应不上 直接返回空 - if(lineInfo.getWorkflowSubStage().equals(subStage)){ + if(!lineInfo.getWorkflowSubStage().equals(subStage)){ return userList; } //加盟商处理时子阶段状态 From 18cc2ca6215d3bb4d2a3b3b2032ed4af0de93884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 16 May 2025 18:05:59 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/controller/webb/PCShopController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb7b60f72..ea83ebc23 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 @@ -148,7 +148,7 @@ public class PCShopController { @ApiOperation("获取筹建阶段处理人信息") @GetMapping("/getSubStageHandle") - public ResponseResult> getSubStageHandle(@RequestParam("lineId")Long shopId, + public ResponseResult> getSubStageHandle(@RequestParam("shopId")Long shopId, @RequestParam("subStage")Integer subStage) { return ResponseResult.success(shopService.getSubStageHandle(shopId,subStage)); } From 8b892bfc9b040c37939806ac618d6230866d50ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 19 May 2025 13:38:01 +0800 Subject: [PATCH 07/10] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/ShopServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3b30707ce..a24956277 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 @@ -731,7 +731,6 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_22: case SHOP_SUB_STAGE_STATUS_30: case SHOP_SUB_STAGE_STATUS_40: - case SHOP_SUB_STAGE_STATUS_50: case SHOP_SUB_STAGE_STATUS_71: case SHOP_SUB_STAGE_STATUS_74: case SHOP_SUB_STAGE_STATUS_905: @@ -751,6 +750,7 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_11: case SHOP_SUB_STAGE_STATUS_21: + case SHOP_SUB_STAGE_STATUS_50: case SHOP_SUB_STAGE_STATUS_110: case SHOP_SUB_STAGE_STATUS_111: case SHOP_SUB_STAGE_STATUS_122: From 8c8fd75d73ceccb619613d217d5028fb79d7fbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 19 May 2025 14:26:31 +0800 Subject: [PATCH 08/10] =?UTF-8?q?feat:=E5=BB=BA=E5=BA=97=E5=93=81=E7=89=8C?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/UserRoleEnum.java | 2 ++ .../java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- .../com/cool/store/service/impl/OrderSysInfoServiceImpl.java | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) 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 74e04dba4..636f95d8c 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 @@ -62,6 +62,8 @@ public enum UserRoleEnum { QUOTATION_OFFICE(470000000L,"报价员"), OWN_SHOP_OFFICE(480000000L,"自有店财务"), + + BRAND_HEAD(490000000L,"品牌负责人"), ; private Long code; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 6cb7b933d..40f4f2904 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -568,7 +568,7 @@ public class DeskServiceImpl implements DeskService { if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus()); } - if (userRoleIds.contains(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE.getCode())) { + if (userRoleIds.contains(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE.getCode()) || userRoleIds.contains(UserRoleEnum.BRAND_HEAD.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); } if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode())) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 18d27b750..46819be9e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -27,8 +27,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.cool.store.enums.UserRoleEnum.PRESIDENT; -import static com.cool.store.enums.UserRoleEnum.VICE_PRESIDENT_IN_CHARGE; +import static com.cool.store.enums.UserRoleEnum.*; import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; /** @@ -206,7 +205,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { switch (nowStatus) { case SHOP_SUB_STAGE_STATUS_153: nextStatus = SHOP_SUB_STAGE_STATUS_154; - List users = userAuthMappingService.getAllUserByRoleEnumAndRegionId(VICE_PRESIDENT_IN_CHARGE, shopInfoDAO.getShopInfo(request.getShopId()).getRegionId()); + List users = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(VICE_PRESIDENT_IN_CHARGE,BRAND_HEAD), shopInfoDAO.getShopInfo(request.getShopId()).getRegionId()); List userIds = new ArrayList<>(); if(CollectionUtils.isNotEmpty(users)){ userIds = users.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); From 9f1b16c4bfbe3c2c670de90b7fab835fb8d016cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 19 May 2025 14:45:07 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feat:=E5=BB=BA=E5=BA=97=E5=93=81=E7=89=8C?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/ShopServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a24956277..f325f172e 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 @@ -757,7 +757,7 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_140: case SHOP_SUB_STAGE_STATUS_141: case SHOP_SUB_STAGE_STATUS_142: - return getUserFromInvestmentManager(lineInfo); + return getUserFromInvestmentManager(shopInfo.getInvestmentManager()); case SHOP_SUB_STAGE_STATUS_70: case SHOP_SUB_STAGE_STATUS_80: @@ -844,8 +844,8 @@ public class ShopServiceImpl implements ShopService { * @param lineInfo * @return */ - private List getUserFromInvestmentManager(LineInfoDO lineInfo) { - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); + private List getUserFromInvestmentManager(String userId) { + EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); if (userInfo != null) { return Collections.singletonList(new UserDTO(userInfo.getName(), userInfo.getMobile())); } From 9e9ada0e4f796b6bdf9af9fdcca320327c901fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 19 May 2025 18:29:17 +0800 Subject: [PATCH 10/10] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/PushServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java index 43896e2f2..5345de760 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java @@ -103,7 +103,7 @@ public class PushServiceImpl implements PushService { } private Boolean modifyXGJPassword(ModifyPasswordDTO dto) { - String apiUrl = xgjUrl + "XXX"; + String apiUrl = xgjUrl + "/open/updateStorePassword"; return executeApiCall(apiUrl, dto, Boolean.class, xgjUsername, xgjSecret); } @@ -116,7 +116,7 @@ public class PushServiceImpl implements PushService { @Override public Boolean modifyDownstreamSystem(ModifyPasswordDTO modifyPasswordDTO) { this.modifyPosPassword(modifyPasswordDTO); - //this.modifyXGJPassword(modifyPasswordDTO); + this.modifyXGJPassword(modifyPasswordDTO); return Boolean.TRUE; }