From a380819e9e3bc21a2ae47990e6065e87cccbeba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 4 Jul 2023 15:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=BB=91=E5=BE=AE=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/HyInterviewDAO.java | 8 +++++ .../com/cool/store/dao/HyPartnerClerkDAO.java | 7 ++++ .../store/dao/HyPartnerIntentInfoDAO.java | 6 ++++ .../store/dao/HyPartnerInterviewPlanDAO.java | 7 ++++ .../HyPartnerCertificationInfoMapper.java | 3 ++ .../store/mapper/HyPartnerClerkMapper.java | 1 + .../mapper/HyPartnerIntentInfoMapper.java | 9 +++++ .../mapper/HyPartnerInterviewMapper.java | 3 ++ .../mapper/HyPartnerInterviewPlanMapper.java | 3 ++ .../HyPartnerCertificationInfoMapper.xml | 6 ++++ .../resources/mapper/HyPartnerClerkMapper.xml | 7 ++++ .../mapper/HyPartnerIntentInfoMapper.xml | 9 +++++ .../mapper/HyPartnerInterviewMapper.xml | 7 ++++ .../mapper/HyPartnerInterviewPlanMapper.xml | 6 ++++ .../impl/HyPartnerBaseInfoServiceImpl.java | 36 +++++++++++++------ 15 files changed, 107 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java index 686ccc629..aaa15e562 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java @@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; @Repository public class HyInterviewDAO { @@ -46,4 +47,11 @@ public class HyInterviewDAO { } + public int updateLineId(Long newLineId,Long oldLineId){ + if (newLineId==null || Objects.isNull(oldLineId)){ + return 0; + } + return interviewMapper.updateLineId(newLineId, oldLineId); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java index 8963346a6..22192df5a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java @@ -55,4 +55,11 @@ public class HyPartnerClerkDAO { return hyPartnerClerkMapper.listByPartnerIdAndLineId(partnerId, partnerLineId); } + public int updateLineId(Long newLineId,Long oldLineId){ + if (newLineId==null || Objects.isNull(oldLineId)){ + return 0; + } + return hyPartnerClerkMapper.updateLineId(newLineId, oldLineId); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java index d52e0414e..90563ec29 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -62,5 +62,11 @@ public class HyPartnerIntentInfoDAO { return hyPartnerIntentInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId); } + public int updateLineId(Long newLineId,Long oldLineId){ + if (newLineId==null || Objects.isNull(oldLineId)){ + return 0; + } + return hyPartnerIntentInfoMapper.updateLineId(newLineId, oldLineId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java index 610e27bbc..f2aa23627 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java @@ -16,6 +16,7 @@ import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; /** * @Author suzhuhong @@ -105,4 +106,10 @@ public class HyPartnerInterviewPlanDAO { } + public int updateLineId(Long newLineId,Long oldLineId){ + if (newLineId==null || Objects.isNull(oldLineId)){ + return 0; + } + return hyPartnerInterviewPlanMapper.updateLineId(newLineId, oldLineId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java index a4d84bddf..192ab9018 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java @@ -39,4 +39,7 @@ public interface HyPartnerCertificationInfoMapper { HyPartnerCertificationInfoDO selectByPartnerLineId(@Param("partnerLineId") Long partnerLineId); + int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java index 5f56188b7..553b5c145 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java @@ -39,5 +39,6 @@ public interface HyPartnerClerkMapper { List listByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId); + int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index e3ae379cf..f6f7470e4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -49,4 +49,13 @@ public interface HyPartnerIntentInfoMapper { HyPartnerIntentInfoDO selectByLineId(@Param("lineId") Long lineId); HyPartnerIntentInfoDO getByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId); + + + /** + * updateLineId + * @param newLineId + * @param oldLineId + * @return + */ + int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index 98c1d88ed..c20fd56fa 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -108,4 +108,7 @@ public interface HyPartnerInterviewMapper { * 查询是否已有该链接 */ Boolean hasVideoUrls(@Param("videoUrl") String videoUrl); + + int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index 3a6886e11..49faf11de 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -170,4 +170,7 @@ public interface HyPartnerInterviewPlanMapper { @Param("workflowStage") String workflowStage, @Param("workflowStatus") String workflowStatus); + int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml index 22e42a816..ae721eaaf 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml @@ -139,4 +139,10 @@ from hy_partner_certification_info where partner_line_id = #{partnerLineId} + + + update hy_partner_interview + set partner_line_id = #{newLineId} + where partner_line_id = #{oldLineId} + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml index 925976e59..ccc9daaf9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml @@ -141,4 +141,11 @@ where partner_id = #{partnerId} and partner_line_id = #{partnerLineId} + + update hy_partner_clerk + set partner_line_id = #{newLineId} + where partner_line_id = #{oldLineId} + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index 4a92bc5fb..7a60f611b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -296,4 +296,13 @@ where partner_id = #{partnerId} and partner_line_id = #{partnerLineId} + + + update hy_partner_intent_info + set partner_line_id = #{newLineId} + where partner_line_id = #{oldLineId} + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index c36696490..8e60a3d02 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -516,4 +516,11 @@ AND hpi.deleted = 0 + + update hy_partner_interview + set partner_line_id = #{newLineId} + where partner_line_id = #{oldLineId} + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 3ca6ecbd5..3c4f8b311 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -530,4 +530,10 @@ + + + update hy_partner_interview_plan + set partner_line_id = #{newLineId} + where partner_line_id = #{oldLineId} + \ No newline at end of file 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 91cb0d8e8..cc2f45f4d 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 @@ -6,19 +6,14 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.RedisConstant; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.HyPartnerBaseInfoDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dao.HyPartnerTaskInfoLogDAO; -import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dao.*; import com.cool.store.dto.log.AddTagsDTO; import com.cool.store.dto.log.BlackListLogDTO; import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.entity.HyPartnerTaskInfoLogDO; -import com.cool.store.entity.HyPartnerUserInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.HyPartnerCertificationInfoMapper; import com.cool.store.request.AddTagsRequest; import com.cool.store.request.PartnerBaseInfoRequest; import com.cool.store.service.HyPartnerBaseInfoService; @@ -66,6 +61,20 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; @Resource HyPhoneLocationService hyPhoneLocationService; + @Resource + HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; + + @Resource + HyInterviewDAO hyInterviewDAO; + + @Resource + HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; + + @Resource + HyPartnerClerkDAO hyPartnerClerkDAO; + + @Resource + HyPartnerCertificationInfoMapper hyPartnerCertificationInfoMapper; @Override @@ -178,9 +187,9 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { HyPartnerLineInfoDO oldLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(oldBaseInfo.getPartnerLineId()); // 该身份证当前申请状态同步至该账号下，原账号变为【加盟意向申请 待提交状态】 HyPartnerLineInfoDO newLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - newLineInfo.setWorkflowStage(oldLineInfo.getWorkflowStage()); - newLineInfo.setWorkflowStatus(oldLineInfo.getWorkflowStatus()); - newLineInfo.setLineStatus(oldLineInfo.getLineStatus()); + Long newLindId = newLineInfo.getId(); + BeanUtil.copyProperties(oldLineInfo,newLineInfo); + newLineInfo.setId(newLindId); hyPartnerLineInfoDAO.updateByPrimaryKeySelective(newLineInfo); oldLineInfo.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); oldLineInfo.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); @@ -196,6 +205,11 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null); oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo); + hyPartnerIntentInfoDAO.updateLineId(newLindId,oldLineInfo.getId()); + hyPartnerClerkDAO.updateLineId(newLindId,oldLineInfo.getId()); + hyPartnerInterviewPlanDAO.updateLineId(newLindId,oldLineInfo.getId()); + hyInterviewDAO.updateLineId(newLindId,oldLineInfo.getId()); + hyPartnerCertificationInfoMapper.updateLineId(newLindId,oldLineInfo.getId()); return true; }