From 1b7e30c50148f166b745a3f0e6d807a361da0149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 10 May 2024 13:44:21 +0800 Subject: [PATCH] subStage --- .../java/com/cool/store/vo/desk/PreparationCommonPendingVO.java | 2 ++ .../main/java/com/cool/store/service/impl/DeskServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java index 818cc227a..fa28669fa 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java @@ -23,6 +23,8 @@ public class PreparationCommonPendingVO { private String regionNodeName; @ApiModelProperty("阶段") private Integer stage; + @ApiModelProperty("子阶段") + private Integer subStage; @ApiModelProperty("阶段状态") private Integer subStageStatus; @ApiModelProperty("线索ID") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 2dc443afa..3abf62cb8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -392,6 +392,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setLineId(x.getLineId()); preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setStage(x.getShopStage()); + preparationCommonPendingVO.setSubStage(x.getShopSubStage()); preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus()); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(),new ShopInfoDO()); preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START,finalShopPayDoMap.getOrDefault(x.getShopId(), new LinePayDO()).getCreateTime()));