diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java index fa2112b1e..9161d075b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java @@ -116,11 +116,12 @@ public enum ShopSubStageEnum { return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50; // case SHOP_STAGE_6: // return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60; - case SHOP_STAGE_7: - return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70; +// case SHOP_STAGE_7: +// return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70; case SHOP_STAGE_2: case SHOP_STAGE_3: case SHOP_STAGE_4: + case SHOP_STAGE_7: case SHOP_STAGE_8: case SHOP_STAGE_8_5: case SHOP_STAGE_8_6: diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java index 214052083..81545c162 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java @@ -13,7 +13,7 @@ public interface FranchiseFeeService { * @param request * @return */ - Boolean submitLicense(FranchiseFeeRequest request); + Boolean submitFranchiseFee(FranchiseFeeRequest request); Boolean update(FranchiseFeeRequest request); /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index adb9afe79..5644480d7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -69,7 +69,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean submitLicense(FranchiseFeeRequest request) { + public Boolean submitFranchiseFee(FranchiseFeeRequest request) { log.info("submitLicense request:{}", JSONObject.toJSONString(request)); ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus())){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index ec8d9181f..fb69d600d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -159,7 +159,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten List shopIds = stages.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10, - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70)); + ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50)); List shopListByIds = shopInfoDAO.getShopListByIds(shopIds); Set regionIds = shopListByIds.stream().map(ShopInfoDO::getRegionId).collect(Collectors.toSet()); Set userSet = shopListByIds.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); @@ -262,7 +262,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten List shopIds = stages.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10, - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70)); + ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50)); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index ce1e393f6..075fd6779 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -1158,18 +1158,29 @@ public class PointServiceImpl implements PointService { } updateShop.setShopManagerUserId(shopManagerUserId); shopInfoDAO.updateShopInfo(updateShop); - //发送工作通知 - Map requestMap = new HashMap<>(); - requestMap.put("partnerName", lineInfo.getUsername()); - requestMap.put("partnerMobile", lineInfo.getMobile()); - requestMap.put("lineId", String.valueOf(lineInfo.getId())); - requestMap.put("shopId", String.valueOf(shopId)); -// if (Objects.nonNull(shopInfo.getShopName())) { -// requestMap.put("storeName",shopInfo.getShopName()); -// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); -// }else { -// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap); -// } + //如果是通过 将缴费状态从未开始改为已开始 已开始的不需要处理 + ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70); + Set publishFranchiseFeeUsers = new HashSet<>(); + List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); + if (Objects.nonNull(joinUser)) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + publishFranchiseFeeUsers.addAll(joinUserIds); + } + List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); + if (Objects.nonNull(regionUser)) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + publishFranchiseFeeUsers.addAll(regionUserIds); + } + HashMap map = new HashMap<>(); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + //发送工作通知 + commonService.sendQWMessage(new ArrayList<>(publishFranchiseFeeUsers), + MessageEnum.MESSAGE_23, + map); + } } shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId); 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 612243af3..c1ce5ba31 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 @@ -154,26 +154,12 @@ public class ShopServiceImpl implements ShopService { //初始化平台账号 HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); shopAccountDAO.initShopAccount(hyPartnerUserInfoDO, shopIds); - Set publishFranchiseFeeUsers = new HashSet<>(); - List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); - if (Objects.nonNull(joinUser)) { - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - publishFranchiseFeeUsers.addAll(joinUserIds); - } - List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); - if (Objects.nonNull(regionUser)) { - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - publishFranchiseFeeUsers.addAll(regionUserIds); - } HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfo.getUsername()); map.put("partnerMobile", lineInfo.getMobile()); commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_14, map); - commonService.sendQWMessage(new ArrayList<>(publishFranchiseFeeUsers), - MessageEnum.MESSAGE_23, - map); commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_21, map); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java index 336d0a10e..acf29a8aa 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java @@ -27,7 +27,7 @@ public class PCFranchiseFeeController { @ApiOperation("基本信息提交") @PostMapping("/submit") public ResponseResult submitLicense(@RequestBody FranchiseFeeRequest request) { - return ResponseResult.success(franchiseFeeService.submitLicense(request)); + return ResponseResult.success(franchiseFeeService.submitFranchiseFee(request)); } @ApiOperation("基本信息修改") @PostMapping("/update") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java index bda8e655f..207c76daa 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java @@ -27,7 +27,7 @@ public class MiniFranchiseFeeController { @ApiOperation("基本信息提交") @PostMapping("/submit") public ResponseResult submitLicense(@RequestBody FranchiseFeeRequest request) { - return ResponseResult.success(franchiseFeeService.submitLicense(request)); + return ResponseResult.success(franchiseFeeService.submitFranchiseFee(request)); } @ApiOperation("基本信息查询")