Merge branch 'cc_20251024_stage_update' into 'master'

POS及营帐通流程修改；新管家数据推送门店名称修改

See merge request hangzhou/java/custom_zxjp!174

coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java

@@ -48,6 +48,12 @@ public interface PreparationService {
      * @param shopId
      */
     void sysStoreCompleted(Long shopId);
+
+    /**
+     * 营业执照和建店资料收集阶段完成后推进POS和营帐通开通
+     * @param shopId 店铺id
+     */
+    void businessLicenseAndBuildStoreCompleted(Long shopId);
     /**
      * 证照办理+建店资料 都完成 初始化平台建店数据
      * @param shopId
@@ -89,6 +95,7 @@ public interface PreparationService {
     /**
      * POS 建店昨天完成
      * 选址与建店资料完成(加盟合同完成)
+     * v20251024 选址与建店资料完成与营业执照完成
      * @param shopId
      * @return
      */

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java

@@ -138,9 +138,11 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_3);
         if (Constants.ONE_INTEGER.equals(request.getSubmitStatus()) && shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus())) {
             shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33, null);
+            preparationService.businessLicenseAndBuildStoreCompleted(request.getShopId());
             preparationService.licenseCompleted(request.getShopId());
             preparationService.updateShopStatus(request.getShopId());
             preparationService.buildStoreAndDecorationComplete(request.getShopId());
+            preparationService.selectSiteAndBuildStoreComplete(request.getShopId());
         }
         return Boolean.TRUE;
     }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java

@@ -293,6 +293,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
         //初始化数据
         preparationService.licenseCompleted(shopId);
         preparationService.sysStoreCompleted(shopId);
+        preparationService.businessLicenseAndBuildStoreCompleted(shopId);
         preparationService.buildStoreAndDecorationComplete(shopId);
         preparationService.selectSiteAndBuildStoreComplete(shopId);
         preparationService.buildStoreComplete(shopId);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java

@@ -220,9 +220,25 @@ public class PreparationServiceImpl implements PreparationService {
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
             if (flag3) {
                 List<ShopSubStageStatusEnum> list = new ArrayList<>();
-                list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230);
+                shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
+            }
+        }
+    }
+
+    @Override
+    public void businessLicenseAndBuildStoreCompleted(Long shopId) {
+        List<ShopStageInfoDO> shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null);
+        if (CollectionUtils.isNotEmpty(shopStageInfo)) {
+            Map<Integer, ShopStageInfoDO> shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data));
+            boolean flag1 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().
+                    equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
+            boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().
+                    equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
+            if (flag1 && flag2) {
+                List<ShopSubStageStatusEnum> list = new ArrayList<>();
+                list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240);
                 shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
             }
@@ -345,10 +361,12 @@ public class PreparationServiceImpl implements PreparationService {
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage()).getShopSubStageStatus());
             Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
+            Boolean flag4 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().
+                    equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
 
-            log.info("selectSiteAndBuildStoreComplete  flag2->{} flag3->{}",flag2,flag3);
+            log.info("selectSiteAndBuildStoreComplete  flag2->{} flag3->{} flag4->{}",flag2,flag3, flag4);
             //都完成了 状态修改
-            if (flag2 && flag3) {
+            if (flag2 && flag3 && flag4) {
                 shopAccountDAO.updateStatusByShopIdAndSystemName(shopId,  Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null);
             }
         }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java

@@ -289,43 +289,31 @@ public class SyncDataServiceImpl implements SyncDataService {
         if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
             //M10001
             if (shopCode.matches("M\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "MX" + shopInfoDO.getShopName();
-                        ? "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             //FS10001
             if (shopCode.matches("FS\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "FS" + shopInfoDO.getShopName();
-                        ? "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             // MS10001
             if (shopCode.matches("MS\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "MS" + shopInfoDO.getShopName();
-                        ? "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             // S10001
             if (shopCode.matches("S\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "S" + shopInfoDO.getShopName();
-                        ? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             // ZX0001
             if (shopCode.matches("ZX\\d*")) {
                 return "ZX" + shopInfoDO.getShopName();
             }
             if(shopCode.matches("HL\\d*")){
-                return partnershipSignatorySecondIsNull
+                return "HL" + shopInfoDO.getShopName();
-                        ? "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
         }
         if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
             if (shopCode.matches("MZGM\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "MZGM" + shopInfoDO.getShopName();
-                        ? "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             if (shopCode.matches("MZGS\\d*")) {
                 return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName();
@@ -333,19 +321,13 @@ public class SyncDataServiceImpl implements SyncDataService {
         }
         if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
             if (shopCode.matches("LX\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "LX" + shopInfoDO.getShopName();
-                        ? "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             if (shopCode.matches("X\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "X" + shopInfoDO.getShopName();
-                        ? "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             if (shopCode.matches("Q\\d*")) {
-                return partnershipSignatorySecondIsNull
+                return "Q" + shopInfoDO.getShopName();
-                        ? "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
             }
             if (shopCode.matches("Z\\d*")) {
                 return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName();