Merge #29 into master from cc_20260114_selectPoint

feat:发送通知节点调整 * cc_20260114_selectPoint: (2 commits squashed) - feat:选址之后才能开启缴费 - feat:发送通知节点调整 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/29
2026-01-19 07:11:31 +00:00
parent e11327f837
commit eb9b8bdf00
8 changed files with 32 additions and 34 deletions
--- 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:
--- 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);
    /**
--- 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())){
--- 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<Long> 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<ShopInfoDO> shopListByIds = shopInfoDAO.getShopListByIds(shopIds);
        Set<Long> regionIds = shopListByIds.stream().map(ShopInfoDO::getRegionId).collect(Collectors.toSet());
        Set<String> userSet = shopListByIds.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
@@ -262,7 +262,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
        List<Long> 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;
    }

--- 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<String, String> 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<String> publishFranchiseFeeUsers = new HashSet<>();
+                List<EnterpriseUserDO> joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId());
+                if (Objects.nonNull(joinUser)) {
+                    Set<String> joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet());
+                    publishFranchiseFeeUsers.addAll(joinUserIds);
+                }
+                List<EnterpriseUserDO> regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId());
+                if (Objects.nonNull(regionUser)) {
+                    Set<String> regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet());
+                    publishFranchiseFeeUsers.addAll(regionUserIds);
+                }
+                HashMap<String, String> 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);

--- 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<String> publishFranchiseFeeUsers = new HashSet<>();
-        List<EnterpriseUserDO> joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId());
-        if (Objects.nonNull(joinUser)) {
-            Set<String> joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet());
-            publishFranchiseFeeUsers.addAll(joinUserIds);
-        }
-        List<EnterpriseUserDO> regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId());
-        if (Objects.nonNull(regionUser)) {
-            Set<String> regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet());
-            publishFranchiseFeeUsers.addAll(regionUserIds);
-        }
        HashMap<String, String> 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);
--- 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")
--- 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("基本信息查询")