From 4da17b583a194c1b625fadbd301f3cdd3b882733 Mon Sep 17 00:00:00 2001
From: wangxiaopeng <807933401@qq.com>
Date: Thu, 21 Mar 2024 16:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/vo/PartnerUserInfoVO.java    | 12 +++++++++++-
 .../store/service/impl/WechatMiniAppServiceImpl.java | 10 ++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
index 584df7d2f..90a6a7d12 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
@@ -57,8 +57,18 @@ public class PartnerUserInfoVO {
     private Boolean needSubmitWantInfo;
 
     @ApiModelProperty("线索id")
-    private Long partnerLineId;
+    private Long lineId;
 
+    @ApiModelProperty("流程阶段:1意向加盟;2新店进展;")
+    private Integer workflowStage;
+
+    @ApiModelProperty("流程子阶段")
+    private Integer workflowSubStage;
+
+    @ApiModelProperty("流程子阶段状态")
+    private Integer workflowSubStageStatus;
+
+    @ApiModelProperty("0.公海 1.私海  2黑名单")
     private Integer lineStatus;
 
     public Boolean getNeedSubmitWantInfo() {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
index cf18704f3..28e431096 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
@@ -132,7 +132,10 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
             LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
             if (lineInfoDO != null){
-                userInfoVO.setPartnerLineId(lineInfoDO.getId());
+                userInfoVO.setLineId(lineInfoDO.getId());
+                userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
+                userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
+                userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
                 userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
             }
         }
@@ -159,7 +162,10 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
             LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
             if (lineInfoDO != null){
-                userInfoVO.setPartnerLineId(lineInfoDO.getId());
+                userInfoVO.setLineId(lineInfoDO.getId());
+                userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
+                userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
+                userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
                 userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
             }
         }