feat:数据处理

coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java

@@ -28,6 +28,10 @@ public enum ShopSubStageEnum {
     SHOP_STAGE_15(ShopStageEnum.SHOP_STAGE_2, 150, "建店资料收集", 9),
     SHOP_STAGE_16(ShopStageEnum.SHOP_STAGE_2, 160, "POS开通", 10),
     SHOP_STAGE_17(ShopStageEnum.SHOP_STAGE_2, 170, "订货系统开通", 10),
+    SHOP_STAGE_23(ShopStageEnum.SHOP_STAGE_2, 230, "信发系统开通", 10),
+    SHOP_STAGE_24(ShopStageEnum.SHOP_STAGE_2, 240, "营帐通开通", 10),
+
+
 
     SHOP_STAGE_18(ShopStageEnum.SHOP_STAGE_3, 180, "抖音", null),
     SHOP_STAGE_19(ShopStageEnum.SHOP_STAGE_3, 190, "美团外卖", null),
@@ -36,8 +40,6 @@ public enum ShopSubStageEnum {
     SHOP_STAGE_22(ShopStageEnum.SHOP_STAGE_3, 220, "快手", null),
 
 
-    SHOP_STAGE_23(ShopStageEnum.SHOP_STAGE_2, 230, "信发系统开通", 10),
-    SHOP_STAGE_24(ShopStageEnum.SHOP_STAGE_2, 240, "营帐通开通", 10),
 
     ;
 

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java

@@ -76,6 +76,21 @@ public class ShopStageInfoDAO {
         return shopStageInfoMapper.batchInsert(addShopStageList);
     }
 
+    public Integer insertSelective(ShopStageInfoDO shopStageInfoDO) {
+        if(Objects.isNull(shopStageInfoDO)){
+            return 0;
+        }
+        return shopStageInfoMapper.insertSelective(shopStageInfoDO);
+    }
+
+    public Integer updateByPrimaryKeySelective(ShopStageInfoDO shopStageInfoDO) {
+        if(Objects.isNull(shopStageInfoDO)){
+            return 0;
+        }
+        return shopStageInfoMapper.updateByPrimaryKeySelective(shopStageInfoDO);
+    }
+
+
     public Integer batchUpdate(List<ShopStageInfoDO> shopStageList) {
         if(CollectionUtils.isEmpty(shopStageList)){
             return 0;

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

@@ -10,6 +10,7 @@ public interface DataHandleService {
 
     /**
      * V1.1 -> V1.2  数据处理
+     * @param shopId
      * @return
      */
     Boolean dataHandleService(Long shopId);

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

@@ -40,6 +40,11 @@ public interface PreparationService {
     void contractAndBuildStoreCompletion(Long shopId);
 
 
+    /**
+     * 建店完成
+     * @param shopId
+     */
+    void sysStoreCompleted(Long shopId);
     /**
      * 证照办理+建店资料 都完成 初始化平台建店数据
      * @param shopId

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

@@ -10,9 +10,11 @@ import com.cool.store.enums.point.ShopStageEnum;
 import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.service.DataHandleService;
+import com.cool.store.utils.poi.DateUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.unit.DataUnit;
 
 import javax.annotation.Resource;
@@ -35,6 +37,7 @@ public class DataHandleServiceImpl implements DataHandleService {
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean dataHandleService(Long shopId) {
         //查询所有的门店线索数据（如果指定shopId 查指定门店的数据）
         List<ShopInfoDO> shopInfoDOS = shopInfoDAO.selectByIdOrSelectAll(shopId);
@@ -48,19 +51,22 @@ public class DataHandleServiceImpl implements DataHandleService {
             initShopStageInfo(x.getLineId(),x.getId());
 
             //老阶段改造-证照
-            ShopStageInfoDO shopStageInfoDO = infoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4);
+            ShopStageInfoDO shopStageInfoDO = infoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage());
             this.licenseHandle(shopStageInfoDO);
 
-
+            //老阶段改造-施工
-
+            ShopStageInfoDO shopStageInfoDO12 = infoDOMap.get(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage());
-
+            Integer b = 1200;
-
+            //如果是待预约 直接换成待验收
-
+            if (b.equals(shopStageInfoDO12.getShopSubStageStatus())){
-
+                ShopSubStageStatusEnum shopSubStageStatus121 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121;
+                shopStageInfoDO12.setShopSubStageStatus(shopSubStageStatus121.getShopSubStageStatus());
+                shopStageInfoDO12.setRemark(shopSubStageStatus121.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus121.getShopSubStageStatusName());
+                shopStageInfoDAO.updateByPrimaryKeySelective(shopStageInfoDO12);
+            }
 
         }
-
+        return Boolean.TRUE;
-        return null;
     }
 
 
@@ -68,31 +74,36 @@ public class DataHandleServiceImpl implements DataHandleService {
         if (Objects.isNull(shopStageInfoDO)){
             return;
         }
+        String planCompleteTime = shopStageInfoDO.getPlanCompleteTime();
+        LocalDate plusFDays = DateUtils.getPlusFDays(DateUtils.strToDate(shopStageInfoDO.getPlanCompleteTime(), DateUtils.YYYY_MM_DD), 32);
         if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){
             //未完成 拆分数据 老的证照办理变为食品许可证
-            ShopSubStageEnum shopSubStageEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageEnum();
+            shopStageInfoDO.setRemark(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatusName());
-            shopStageInfoDO.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatusName());
+            shopStageInfoDO.setPlanCompleteTime(plusFDays.toString());
-            shopStageInfoDAO.updateByShopId(shopStageInfoDO);
+            shopStageInfoDAO.updateByPrimaryKeySelective(shopStageInfoDO);
             //新增营业执照证照办理
             shopStageInfoDO.setId(null);
             ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
             shopStageInfoDO.setShopSubStage(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage());
             shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
+            shopStageInfoDO.setPlanCompleteTime(planCompleteTime);
             shopStageInfoDO.setRemark(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
-            shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
+            shopStageInfoDAO.insertSelective(shopStageInfoDO);
         }
         if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){
             //未完成 拆分数据 老的证照办理变为食品许可证
             ShopSubStageEnum shopSubStageEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageEnum();
             shopStageInfoDO.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatusName());
-            shopStageInfoDAO.updateByShopId(shopStageInfoDO);
+            shopStageInfoDO.setPlanCompleteTime(plusFDays.toString());
+            shopStageInfoDAO.updateByPrimaryKeySelective(shopStageInfoDO);
             //新增营业执照证照办理
             shopStageInfoDO.setId(null);
             ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30;
             shopStageInfoDO.setShopSubStage(shopSubStageStatus30.getShopSubStageEnum().getShopSubStage());
             shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
             shopStageInfoDO.setRemark(shopSubStageStatus30.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
-            shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
+            shopStageInfoDO.setPlanCompleteTime(planCompleteTime);
+            shopStageInfoDAO.insertSelective(shopStageInfoDO);
         }
         //待审核
         Integer a = 410;
@@ -102,8 +113,9 @@ public class DataHandleServiceImpl implements DataHandleService {
             shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus43.getShopSubStageStatus());
             shopStageInfoDO.setRemark(shopSubStageStatus43.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus43.getShopSubStageStatusName());
             shopStageInfoDO.setIsTerminated(Boolean.TRUE);
+            shopStageInfoDO.setPlanCompleteTime(planCompleteTime);
             shopStageInfoDO.setActualCompleteTime(DateUtil.formatDate(new Date()));
-            shopStageInfoDAO.updateByShopId(shopStageInfoDO);
+            shopStageInfoDAO.updateByPrimaryKeySelective(shopStageInfoDO);
             //新增营业执照证照办理
             shopStageInfoDO.setId(null);
             ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33;
@@ -111,21 +123,26 @@ public class DataHandleServiceImpl implements DataHandleService {
             shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
             shopStageInfoDO.setRemark(shopSubStageStatus30.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
             shopStageInfoDO.setIsTerminated(Boolean.TRUE);
+            shopStageInfoDO.setPlanCompleteTime(planCompleteTime);
             shopStageInfoDO.setActualCompleteTime(DateUtil.formatDate(new Date()));
-            shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
+            shopStageInfoDAO.insertSelective(shopStageInfoDO);
         }
         if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){
             //未完成 拆分数据 老的证照办理变为食品许可证
             ShopSubStageEnum shopSubStageEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageEnum();
             shopStageInfoDO.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatusName());
-            shopStageInfoDAO.updateByShopId(shopStageInfoDO);
+            shopStageInfoDO.setPlanCompleteTime(plusFDays.toString());
+            shopStageInfoDAO.updateByPrimaryKeySelective(shopStageInfoDO);
             //新增营业执照证照办理
             shopStageInfoDO.setId(null);
             ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33;
             shopStageInfoDO.setShopSubStage(shopSubStageStatus30.getShopSubStageEnum().getShopSubStage());
             shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
             shopStageInfoDO.setRemark(shopSubStageStatus30.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
-            shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
+            shopStageInfoDO.setIsTerminated(Boolean.TRUE);
+            shopStageInfoDO.setPlanCompleteTime(planCompleteTime);
+            shopStageInfoDO.setActualCompleteTime(DateUtil.formatDate(new Date()));
+            shopStageInfoDAO.insertSelective(shopStageInfoDO);
         }
     }
 

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

@@ -202,6 +202,20 @@ public class PreparationServiceImpl implements PreparationService {
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140);
                 list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150);
+                shopStageInfoDAO.batchUpdateShopStageStatus(shopId,list);
+            }
+        }
+    }
+
+    @Override
+    public void sysStoreCompleted(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 flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus().
+                    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);
@@ -222,6 +236,7 @@ public class PreparationServiceImpl implements PreparationService {
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage()).getShopSubStageStatus());
             Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus().
                     equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
+
             //都完成了 初始化后续流程数据
             if (flag1&&flag2&&flag3) {
                 //初始化后续流程数据s

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

@@ -241,7 +241,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         //证照办理
         LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
 
-        RegionDO regionInfo = regionMapper.getByRegionId(lineInfoDO.getRegionId());
+        RegionDO regionInfo = regionMapper.getByRegionId(shopInfoDO.getRegionId());
 
 
         addSignFranchiseResponse.setDetailAddress(shopInfoDO.getDetailAddress());
@@ -267,7 +267,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName());
 
         if (Objects.nonNull(regionInfo)){
-            addSignFranchiseResponse.setRegionId(lineInfoDO.getRegionId());
+            addSignFranchiseResponse.setRegionId(shopInfoDO.getRegionId());
             addSignFranchiseResponse.setRegionName(regionInfo.getName());
         }
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

@@ -9,6 +9,7 @@ import com.cool.store.mq.util.HttpRestTemplateService;
 import com.cool.store.request.xfsgFirstOrderListRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.response.xfsgFirstOderListResponse;
+import com.cool.store.service.DataHandleService;
 import com.cool.store.service.ShopService;
 import com.cool.store.service.impl.CommonService;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,8 @@ public class PCTestController {
     private ShopService shopService;
     @Resource
     private LineInterviewDAO lineInterviewDAO;
+    @Resource
+    DataHandleService dataHandleService;
     static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid=";
 
     @Resource
@@ -84,4 +87,10 @@ public class PCTestController {
         return ResponseResult.success(Boolean.FALSE);
     }
 
+
+    @GetMapping("/dataHandle")
+    public ResponseResult<Boolean> dataHandle(@RequestParam("shopId")Long shopId){
+        return ResponseResult.success(dataHandleService.dataHandleService(shopId));
+    }
+
 }