From ef2e5ce17f35276ce63deda4e1dec16bbd2eca0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Fri, 6 Feb 2026 07:45:10 +0000 Subject: [PATCH] Merge #42 into master from cc_20260123_operations_consultant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:加盟合同阶段未完成 不支持调整运营顾问 * cc_20260123_operations_consultant: (3 commits squashed) - feat:门店转让运营顾问 - Merge branch 'master' into cc_20260123_operations_consultant - feat:加盟合同阶段未完成 不支持调整运营顾问 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/42 --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../com/cool/store/service/ShopService.java | 7 +++++++ .../store/service/impl/ShopServiceImpl.java | 20 ++++++++++++++++++- .../controller/webb/PCShopController.java | 6 ++++++ 4 files changed, 33 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 d4c44ec88..094a03399 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 @@ -324,6 +324,7 @@ public enum ErrorCodeEnum { JOIN_MODE_NOT_ALLOW_OPERATE(1610012,"加盟部人员只能新建加盟店或联营店，请确认！",null), STORE_NOT_FIND(1610013,"门店不存在",null), SHOP_NAME_INVALID(1610014, "门店名称包含禁止关键词",null), + CONTRACT_STAGE_NO_COMPLETE(1610015, "合同签约阶段未完成，无法分配运营顾问！",null), //装修 TEAM_USED(1612001,"该装修团队有门店使用，无法删除，请确认！",null), CURRENT_BRAND_SORT_NUMBER_EXIST(16100007,"当前品牌已存在该排序数字！",null), 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 818bf44a2..3f3eb7926 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 @@ -92,6 +92,13 @@ public interface ShopService { */ Integer updateShopInvestment(Long shopId,String updateUserId,String userId); + /** + * 转让运营顾问 + * @param shopId + * @param operationsConsultant + * @return + */ + Boolean updateOperationsConsultant(Long shopId,String operationsConsultant); /** * 门店结束跟进 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 26bcc66bd..071d3c032 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 @@ -48,6 +48,7 @@ import java.util.stream.Stream; import static com.cool.store.enums.ErrorCodeEnum.*; import static com.cool.store.enums.UserRoleEnum.*; import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; +import static com.cool.store.enums.point.ShopSubStageEnum.SHOP_STAGE_8; /** * @author zhangchenbiao @@ -187,7 +188,7 @@ public class ShopServiceImpl implements ShopService { Map wantRegionMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); List scheduleList = shopStageInfoDAO.getScheduleList(shopIds); Map scheduleMap = scheduleList.stream().collect(Collectors.toMap(ScheduleDTO::getShopId, x -> x)); - List subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + List subStageList = shopStageInfoDAO.getSubStageList(shopIds, SHOP_STAGE_8.getShopSubStage()); Map stageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, Function.identity())); List regionIds = shopList.stream().flatMap(v -> Stream.of(v.getRegionId(), v.getInvestRegionId())).collect(Collectors.toList()); regionIds.addAll(Optional.of(shopList).orElse(Collections.emptyList()).stream().map(ShopInfoDO::getManagerRegionId).collect(Collectors.toList())); @@ -491,6 +492,23 @@ public class ShopServiceImpl implements ShopService { return shopInfoDAO.updateShopInfo(shopInfo); } + @Override + public Boolean updateOperationsConsultant(Long shopId, String operationsConsultant) { + if (StringUtils.isEmpty(operationsConsultant)||Objects.isNull(shopId)){ + throw new ServiceException(PARAMS_VALIDATE_ERROR); + } + log.info("updateOperationsConsultant shopId:{},operationsConsultant:{}",shopId,operationsConsultant); + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, SHOP_STAGE_8); + //缴费阶段未完成 不能分配运营顾问 + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ + throw new ServiceException(CONTRACT_STAGE_NO_COMPLETE); + } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + shopInfo.setOperationsConsultant(operationsConsultant); + shopInfoDAO.updateShopInfo(shopInfo); + return Boolean.TRUE; + } + @Resource PointService pointService; 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 a75b819bb..1705c0870 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 @@ -110,6 +110,12 @@ public class PCShopController { return ResponseResult.success(shopService.updateShopInvestment(shopId, updateUserId, userId)); } + @ApiOperation("门店转让运营顾问") + @GetMapping("/updateOperationsConsultant") + public ResponseResult updateOperationsConsultant(@RequestParam("shopId") Long shopId, @RequestParam("updateUserId") String updateUserId) { + return ResponseResult.success(shopService.updateOperationsConsultant(shopId, updateUserId)); + } + @ApiOperation("门店转让记录") @GetMapping("/getTransferLogPage") @ApiImplicitParams({