From 85ccaf5deac79cde7946b3b36b33e00894b3e5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 2 Jan 2025 15:40:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E7=A5=A8=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/point/ShopSubStageEnum.java | 1 + .../com/cool/store/dao/ShopStageInfoDAO.java | 10 +++ .../store/controller/webc/TestController.java | 61 +++++++++++++++++++ 3 files changed, 72 insertions(+) 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 a7fa6c5e4..408c6869d 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 @@ -106,6 +106,7 @@ public enum ShopSubStageEnum { case SHOP_STAGE_3: case SHOP_STAGE_4: case SHOP_STAGE_8: + case SHOP_STAGE_8_5: case SHOP_STAGE_9: case SHOP_STAGE_11: case SHOP_STAGE_12: diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 70d5cff00..21700d9ed 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -336,4 +336,14 @@ public class ShopStageInfoDAO { } return shopStageInfoMapper.getPlatformBuildStage(shopIds); } + + /** + * 数据处理 查询所有子阶段 通过子阶段对应的阶段状态 做对应的数据处理 + * @param shopSubStage + * @return + */ + public List getSubStages(Integer shopSubStage){ + return shopStageInfoMapper.getSubStageList(null,shopSubStage); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java index f50b2a5f6..b466edc93 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java @@ -1,12 +1,17 @@ package com.cool.store.controller.webc; import com.alibaba.fastjson.JSONObject; +import com.cool.store.constants.CommonConstants; import com.cool.store.dao.*; import com.cool.store.dto.OpenCityDTO; import com.cool.store.dto.ocr.InvoiceDTO; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.IDCardSideEnum; +import com.cool.store.enums.WorkflowSubStageEnum; +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.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.job.XxlJobHandler; @@ -26,10 +31,14 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.ByteArrayOutputStream; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.concurrent.Future; +import java.util.stream.Collectors; @Slf4j @RestController @@ -60,6 +69,9 @@ public class TestController { @Resource private XxlJobHandler xxlJobHandler; + + @Resource + ShopStageInfoDAO shopStageInfoDAO; @PostMapping("/getFirstOrders") public ResponseResult getFirstOrders(@RequestBody xfsgFirstOrderListRequest storeCodeList) { xfsgFirstOderListResponse firstOrderList = coolStoreStartFlowService.getFirstOrderList(storeCodeList); @@ -200,4 +212,53 @@ public class TestController { return ResponseResult.success(); } + + + @GetMapping("/stageDataHandler") + public ResponseResult stageDataHandler(){ + + //查询所有完成初始化铺位加盟合同的完成情况 + List subStages = shopStageInfoDAO.getSubStages(ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + + List existSubStages = shopStageInfoDAO.getSubStages(ShopSubStageEnum.SHOP_STAGE_8_5.getShopSubStage()); + + //existSubStages + List shopIds = existSubStages.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); + + //-100 800 840 如果是-100或者800直接 发票回传是-100 如果是840 发票回传是直接完成 890 + List list = new ArrayList<>(); + for (ShopStageInfoDO x : subStages) { + if (shopIds.contains(x.getShopId())) { + log.info("已存在"); + continue; + } + ShopStageInfoDO shopStageInfo = new ShopStageInfoDO(); + shopStageInfo.setLineId(x.getLineId()); + shopStageInfo.setShopId(x.getShopId()); + //发票回传 是2 + ShopStageEnum shopStageEnum = ShopStageEnum.SHOP_STAGE_2; + shopStageInfo.setShopStage(shopStageEnum.getShopStage()); + ShopSubStageEnum shopSubStageEnum = ShopSubStageEnum.SHOP_STAGE_8_5; + shopStageInfo.setShopSubStage(shopSubStageEnum.getShopSubStage()); + //默认是已完成 + ShopSubStageStatusEnum initStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_3; + //如果加盟合同没完成 则发票回传是未开始 + if (x.getShopSubStageStatus() == -100 || x.getShopSubStageStatus() == 800) { + initStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00; + } + shopStageInfo.setShopSubStageStatus(initStatus.getShopSubStageStatus()); + shopStageInfo.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR + initStatus.getShopSubStageStatusName()); + shopStageInfo.setIsTerminated(Boolean.FALSE); + LocalDate localDate = LocalDate.parse(x.getPlanCompleteTime()).plusDays(1); + shopStageInfo.setPlanCompleteTime(shopSubStageEnum.getPlanCompleteTime(localDate)); + list.add(shopStageInfo); + } + log.info("list:{}",JSONObject.toJSONString(list)); + shopStageInfoDAO.batchInsert(list); + return ResponseResult.success(); + } + + + + }