From 92cc7bbad63486e54ab199779c3e4a4aaa35593f Mon Sep 17 00:00:00 2001
From: wxp01309236 <wxp01309236@alibaba-inc.com>
Date: Tue, 4 Jul 2023 20:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=80=81=E7=BA=BF=E7=B4=A2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/store/dao/HyPartnerLineInfoDAO.java  |  5 +++-
 .../store/mapper/HyPartnerLineInfoMapper.java |  5 ++--
 .../mapper/HyPartnerLineInfoMapper.xml        | 23 ++++++++++++++++
 .../impl/HyPartnerBaseInfoServiceImpl.java    | 27 +++++++++++++++----
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
index a10f0a721..35bcf9b29 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
@@ -9,7 +9,6 @@ import com.cool.store.mapper.HyPartnerLineInfoMapper;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
@@ -60,6 +59,10 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
     }
 
+    public int updateByPrimaryKey(HyPartnerLineInfoDO record){
+        return hyPartnerLineInfoMapper.updateByPrimaryKey(record);
+    }
+
 
     public  Integer getAdventLineCount( String userId, String currentDate){
         if (StringUtils.isEmpty(userId)){
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
index 8acd80697..a1830c98f 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
@@ -5,8 +5,6 @@ import com.cool.store.dto.partner.PartnerBlackListDTO;
 import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO;
 import com.cool.store.dto.partner.StageCountDTO;
 import com.cool.store.entity.HyPartnerLineInfoDO;
-import com.cool.store.vo.LineFollowHistoryVO;
-import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -54,6 +52,9 @@ public interface HyPartnerLineInfoMapper {
      */
     int updateByPrimaryKeySelective(@Param("record") HyPartnerLineInfoDO record);
 
+    int updateByPrimaryKey(@Param("record") HyPartnerLineInfoDO record);
+
+
     /**
      * 当前用户指定时间 临期线索
      * @param userId
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 76778f863..992dcc18c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -253,6 +253,29 @@
     where id = #{record.id}
   </update>
 
+  <update id="updateByPrimaryKey">
+    update hy_partner_line_info
+    set
+    partner_id = #{record.partnerId},
+    workflow_stage = #{record.workflowStage},
+    workflow_status = #{record.workflowStatus},
+    line_status = #{record.lineStatus},
+    investment_manager = #{record.investmentManager},
+    development_director = #{record.developmentDirector},
+    development_manager = #{record.developmentManager},
+    deadline = #{record.deadline},
+    pass_reason = #{record.passReason},
+    reject_public_reason = #{record.rejectPublicReason},
+    reject_real_reason = #{record.rejectRealReason},
+    certify_file = #{record.certifyFile},
+    close_time = #{record.closeTime},
+    close_user_id = #{record.closeUserId},
+    join_black_reason = #{record.joinBlackReason},
+    remove_black_reason = #{record.removeBlackReason},
+    user_channel_id = #{record.userChannelId}
+    where id = #{record.id}
+  </update>
+
   <select id="getAdventLineCount" resultType="java.lang.Integer">
     select count(1) from hy_partner_line_info
     <where>
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
index 6d8eed05d..3fec5dca7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
@@ -189,14 +189,12 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
         HyPartnerLineInfoDO newLineInfo =  hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId);
         Long newLindId = newLineInfo.getId();
         String newPartnerId = newLineInfo.getPartnerId();
-        BeanUtil.copyProperties(oldLineInfo,newLineInfo);
+        BeanUtil.copyProperties(oldLineInfo,newLineInfo,"createTime","updateTime","id","deleted");
         newLineInfo.setId(newLindId);
         newLineInfo.setPartnerId(newPartnerId);
         hyPartnerLineInfoDAO.updateByPrimaryKeySelective(newLineInfo);
-        oldLineInfo.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
-        oldLineInfo.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode());
-        oldLineInfo.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode());
-        hyPartnerLineInfoDAO.updateByPrimaryKeySelective(oldLineInfo);
+        cleanOldLineInfo(oldLineInfo);
+        hyPartnerLineInfoDAO.updateByPrimaryKey(oldLineInfo);
         // 新线索绑定身份证号
         HyPartnerBaseInfoDO newBaseInfo = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(currentUser.getPartnerId(), lineId);
         fillBaseInfoIdCard(newBaseInfo, oldBaseInfo.getIdCard(), oldBaseInfo.getIdCardPhotoFront(), oldBaseInfo.getIdCardPhotoBlack(), oldBaseInfo.getUsername(),
@@ -231,6 +229,25 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
         return true;
     }
 
+    private void cleanOldLineInfo(HyPartnerLineInfoDO oldLineInfo) {
+        oldLineInfo.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
+        oldLineInfo.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode());
+        oldLineInfo.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode());
+        oldLineInfo.setInvestmentManager(null);
+        oldLineInfo.setDevelopmentDirector(null);
+        oldLineInfo.setDevelopmentManager(null);
+        oldLineInfo.setDeadline(null);
+        oldLineInfo.setPassReason(null);
+        oldLineInfo.setRejectPublicReason(null);
+        oldLineInfo.setRejectRealReason(null);
+        oldLineInfo.setCertifyFile(null);
+        oldLineInfo.setCloseTime(null);
+        oldLineInfo.setCloseUserId(null);
+        oldLineInfo.setJoinBlackReason(null);
+        oldLineInfo.setRemoveBlackReason(null);
+        oldLineInfo.setUserChannelId(null);
+    }
+
     @Override
     public HyPartnerBaseInfoDO generateBaseInfo(HyPartnerUserInfoDO hyPartnerUserInfoDO, Long partnerLineId, String userPortrait) {
         HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), partnerLineId);