From d09d3171341e510f319b6867686919fce2b9014f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 27 Jun 2023 21:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 +
 .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +-
 .../store/service/impl/HyPartnerLineInfoServiceImpl.java  | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
index 2e4c7bb1b..08938fde2 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
@@ -58,6 +58,7 @@ public enum ErrorCodeEnum {
     PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null),
     INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null),
     INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败！", null),
+    PUBLIC_LINE_NOT_OPERATE(500008, "公海线索不允许操作！", null),
 
     INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
     DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index e7efc5268..5cad552a8 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -568,7 +568,7 @@
   <select id="getLineFollowHistoryList" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List"></include>
     FROM hy_partner_line_info
-    where (deleted = 1 or (deleted=0 and line_status=0))
+    where (deleted = 1 or (deleted=0 and line_status=0 and close_time is not null))
     and partner_id = #{partner_id}
   </select>
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index 86e9a4ff7..402d99184 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -295,9 +295,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         newHyPartnerLineInfoDO.setLineStatus(status);
         hyPartnerLineInfoDAO.insertSelective(newHyPartnerLineInfoDO);
 
+        HyPartnerBaseInfoDO oldHyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(lineId);
+
         HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO();
         hyPartnerBaseInfoDO.setPartnerId(hyPartnerLineInfo.getPartnerId());
         hyPartnerBaseInfoDO.setPartnerLineId(newHyPartnerLineInfoDO.getId());
+        hyPartnerBaseInfoDO.setUserPortrait(oldHyPartnerBaseInfoDO.getUserPortrait());
         hyPartnerBaseInfoDAO.insertSelective(hyPartnerBaseInfoDO);
 
         //添加日志
@@ -319,6 +322,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         if (hyPartnerLineInfoDO==null){
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
         }
+        if (hyPartnerLineInfoDO.getLineStatus()==0){
+            throw new ServiceException(ErrorCodeEnum.PUBLIC_LINE_NOT_OPERATE);
+        }
         String oldWorkflowStage = hyPartnerLineInfoDO.getWorkflowStage();
         String oldWorkflowStatus = hyPartnerLineInfoDO.getWorkflowStatus();
         //通过
@@ -508,7 +514,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         List<LineFollowHistoryVO> result = new ArrayList<>();
         lineFollowHistoryList.forEach(x->{
             LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO();
-            lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason());
+            lineFollowHistoryVO.setCloseCause(x.getRejectRealReason());
             lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC));
             lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC));
             result.add(lineFollowHistoryVO);