From 7b84c3f5990fcf0d92ed27c1a02d8f2fb49329a9 Mon Sep 17 00:00:00 2001
From: wangxiaopeng <807933401@qq.com>
Date: Fri, 22 Mar 2024 14:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WechatMiniAppServiceImpl.java        | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

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 28e431096..7b16a615b 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
@@ -130,14 +130,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
                 }
             }
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
-            LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
-            if (lineInfoDO != null){
-                userInfoVO.setLineId(lineInfoDO.getId());
-                userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
-                userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
-                userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
-                userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
-            }
+            fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId());
         }
         userInfoVO.setOpenid(openid);
         userInfoVO.setUnionId(unionId);
@@ -160,14 +153,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
         if(hyPartnerUserInfoDO != null){
             userInfoVO = new PartnerUserInfoVO();
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
-            LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
-            if (lineInfoDO != null){
-                userInfoVO.setLineId(lineInfoDO.getId());
-                userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
-                userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
-                userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
-                userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
-            }
+            fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId());
         }
         return userInfoVO;
     }
@@ -229,14 +215,22 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
                 HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
                 userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim());
             }
-            /*HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
-            if (lineInfoDO != null){
-                userInfoVO.setPartnerLineId(lineInfoDO.getId());
-            }*/
+            fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId());
         }
         return userInfoVO;
     }
 
+    private void fillLineInfo(PartnerUserInfoVO userInfoVO, String partnerId) {
+        LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(partnerId);
+        if (lineInfoDO != null){
+            userInfoVO.setLineId(lineInfoDO.getId());
+            userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage());
+            userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
+            userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus());
+            userInfoVO.setLineStatus(lineInfoDO.getLineStatus());
+        }
+    }
+
     @Override
     public String getMiniAppUrl() {
         MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO = new MiniAppUrlLinkReqDTO();