suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-08 16:35:04 +08:00
parent 36fa82b1a8 74ddb4bb05
commit 0c15091dc4
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java
View File

@@ -21,6 +21,8 @@ public class PreparationCommonPendingVO {
private String partnerPhone;
@ApiModelProperty("所属战区")
private String regionNodeName;
@ApiModelProperty("阶段")
private Integer stage;
@ApiModelProperty("阶段状态")
private Integer subStageStatus;
@ApiModelProperty("线索ID")

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -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()));