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 6dd9014dc..818cc227a 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 @@ -21,6 +21,8 @@ public class PreparationCommonPendingVO { private String partnerPhone; @ApiModelProperty("所属战区") private String regionNodeName; + @ApiModelProperty("阶段") + private Integer stage; @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 591157d9f..2dc443afa 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 @@ -391,6 +391,7 @@ public class DeskServiceImpl implements DeskService { PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO(); preparationCommonPendingVO.setLineId(x.getLineId()); preparationCommonPendingVO.setShopId(x.getShopId()); + preparationCommonPendingVO.setStage(x.getShopStage()); 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()));