From b4eb489479723508632c3c694aed231847064587 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 16:54:51 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/HyPartnerBaseInfoServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 b7d8c414d..06fbc5b6c 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 @@ -218,6 +218,12 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { hyPartnerInterviewPlanDAO.updateLineId(newLindId,oldLineInfo.getId()); hyInterviewDAO.updateLineId(newLindId,oldLineInfo.getId()); hyPartnerCertificationInfoMapper.updateLineId(newLindId,oldLineInfo.getId()); + String cacheKeyBaseInfo = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, newPartnerId, newLindId); + String cacheKeyClerkInfo = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY,newPartnerId, newLindId); + String cacheKeyIntentInfo = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, newPartnerId, newLindId); + redisUtilPool.delKey(cacheKeyBaseInfo); + redisUtilPool.delKey(cacheKeyClerkInfo); + redisUtilPool.delKey(cacheKeyIntentInfo); return true; } From ee6a497c255c454e7585b14514d9ab265e55e22c 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 17:28:03 +0800 Subject: [PATCH 2/8] newPartnerId --- .../main/java/com/cool/store/dao/HyInterviewDAO.java | 4 ++-- .../java/com/cool/store/dao/HyPartnerClerkDAO.java | 4 ++-- .../com/cool/store/dao/HyPartnerIntentInfoDAO.java | 4 ++-- .../com/cool/store/dao/HyPartnerInterviewPlanDAO.java | 4 ++-- .../store/mapper/HyPartnerCertificationInfoMapper.java | 2 +- .../com/cool/store/mapper/HyPartnerClerkMapper.java | 2 +- .../cool/store/mapper/HyPartnerIntentInfoMapper.java | 2 +- .../cool/store/mapper/HyPartnerInterviewMapper.java | 2 +- .../store/mapper/HyPartnerInterviewPlanMapper.java | 2 +- .../mapper/HyPartnerCertificationInfoMapper.xml | 2 +- .../src/main/resources/mapper/HyPartnerClerkMapper.xml | 2 +- .../resources/mapper/HyPartnerIntentInfoMapper.xml | 2 +- .../main/resources/mapper/HyPartnerInterviewMapper.xml | 2 +- .../resources/mapper/HyPartnerInterviewPlanMapper.xml | 2 +- .../service/impl/HyPartnerBaseInfoServiceImpl.java | 10 +++++----- 15 files changed, 23 insertions(+), 23 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 aaa15e562..a653f58c7 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 @@ -47,11 +47,11 @@ public class HyInterviewDAO { } - public int updateLineId(Long newLineId,Long oldLineId){ + public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ if (newLineId==null || Objects.isNull(oldLineId)){ return 0; } - return interviewMapper.updateLineId(newLineId, oldLineId); + return interviewMapper.updateLineId(newPartnerId,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 22192df5a..3df225b6f 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,11 +55,11 @@ public class HyPartnerClerkDAO { return hyPartnerClerkMapper.listByPartnerIdAndLineId(partnerId, partnerLineId); } - public int updateLineId(Long newLineId,Long oldLineId){ + public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ if (newLineId==null || Objects.isNull(oldLineId)){ return 0; } - return hyPartnerClerkMapper.updateLineId(newLineId, oldLineId); + return hyPartnerClerkMapper.updateLineId(newPartnerId,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 90563ec29..bd2edc7d1 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,11 +62,11 @@ public class HyPartnerIntentInfoDAO { return hyPartnerIntentInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId); } - public int updateLineId(Long newLineId,Long oldLineId){ + public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ if (newLineId==null || Objects.isNull(oldLineId)){ return 0; } - return hyPartnerIntentInfoMapper.updateLineId(newLineId, oldLineId); + return hyPartnerIntentInfoMapper.updateLineId(newPartnerId,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 f2aa23627..5e1903c61 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 @@ -106,10 +106,10 @@ public class HyPartnerInterviewPlanDAO { } - public int updateLineId(Long newLineId,Long oldLineId){ + public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ if (newLineId==null || Objects.isNull(oldLineId)){ return 0; } - return hyPartnerInterviewPlanMapper.updateLineId(newLineId, oldLineId); + return hyPartnerInterviewPlanMapper.updateLineId(newPartnerId,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 192ab9018..42eaa37fb 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,7 +39,7 @@ public interface HyPartnerCertificationInfoMapper { HyPartnerCertificationInfoDO selectByPartnerLineId(@Param("partnerLineId") Long partnerLineId); - int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + int updateLineId(@Param("newPartnerId") String newPartnerId, @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 553b5c145..e52a94f03 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,6 +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); + int updateLineId(@Param("newPartnerId")String newPartnerId,@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 f6f7470e4..623f1d356 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 @@ -57,5 +57,5 @@ public interface HyPartnerIntentInfoMapper { * @param oldLineId * @return */ - int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + int updateLineId(@Param("newPartnerId")String newPartnerId,@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 c20fd56fa..def3f6a82 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 @@ -109,6 +109,6 @@ public interface HyPartnerInterviewMapper { */ Boolean hasVideoUrls(@Param("videoUrl") String videoUrl); - int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + int updateLineId(@Param("newPartnerId") String newPartnerId, @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 49faf11de..463f355ab 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,7 +170,7 @@ public interface HyPartnerInterviewPlanMapper { @Param("workflowStage") String workflowStage, @Param("workflowStatus") String workflowStatus); - int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + int updateLineId(@Param("newPartnerId") String newPartnerId, @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 ae721eaaf..b7713fef3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml @@ -142,7 +142,7 @@ update hy_partner_interview - set partner_line_id = #{newLineId} + set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} 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 ccc9daaf9..ae27c8b67 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml @@ -143,7 +143,7 @@ update hy_partner_clerk - set partner_line_id = #{newLineId} + set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} where partner_line_id = #{oldLineId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index 7a60f611b..cfa2537ac 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -299,7 +299,7 @@ update hy_partner_intent_info - set partner_line_id = #{newLineId} + set partner_line_id = #{newLineId},partner_id = #{newPartnerId} where partner_line_id = #{oldLineId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 8e60a3d02..f88f57beb 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -518,7 +518,7 @@ update hy_partner_interview - set partner_line_id = #{newLineId} + set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} where partner_line_id = #{oldLineId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 3c4f8b311..8fa1eaf91 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -533,7 +533,7 @@ update hy_partner_interview_plan - set partner_line_id = #{newLineId} + set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} 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 06fbc5b6c..caf2af827 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 @@ -213,11 +213,11 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); } 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()); + hyPartnerIntentInfoDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); + hyPartnerClerkDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); + hyPartnerInterviewPlanDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); + hyInterviewDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); + hyPartnerCertificationInfoMapper.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); String cacheKeyBaseInfo = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, newPartnerId, newLindId); String cacheKeyClerkInfo = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY,newPartnerId, newLindId); String cacheKeyIntentInfo = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, newPartnerId, newLindId); From 91e77766ec422da36fc838e4464f4772ba7596a3 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 17:35:17 +0800 Subject: [PATCH 3/8] newPartnerId --- .../com/cool/store/service/HyPartnerLineInfoService.java | 2 +- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 3 ++- .../main/java/com/cool/store/controller/DeskController.java | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java index 79e569b8c..ff26d13a7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java @@ -150,7 +150,7 @@ public interface HyPartnerLineInfoService { */ String getAssignFollowUser(String partnerId,String type); - InterviewVO getInterviewInfo(Long lineId) throws ApiException; + InterviewVO getInterviewInfo(Long lineId,Boolean needDevelopmentDirector) throws ApiException; /** * 生成一条默认线索 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 4e0522c2b..46566cb05 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 @@ -674,11 +674,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public InterviewVO getInterviewInfo(Long lineId) throws ApiException { + public InterviewVO getInterviewInfo(Long lineId,Boolean needDevelopmentDirector) throws ApiException { Long interviewId = hyPartnerInterviewPlanDAO.selectInterviewIdByLineId(lineId); QueryByInterviewPlanIdReq queryByInterviewPlanIdReq = new QueryByInterviewPlanIdReq(); if (interviewId!=null){ queryByInterviewPlanIdReq.setInterviewPlanId(String.valueOf(interviewId)); + queryByInterviewPlanIdReq.setNeedDevelopmentDirector(needDevelopmentDirector); return interviewService.getInterviewInfo(queryByInterviewPlanIdReq); } return null; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 8b3774b4e..b60bd398c 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -302,7 +302,8 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId)); + public ResponseResult getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId, + @RequestParam(value = "needDevelopmentDirector",required = false)Boolean needDevelopmentDirector) throws ApiException { + return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId,needDevelopmentDirector)); } } From f544530b0e5feee68084e545ff94d0c2be387b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 4 Jul 2023 17:37:13 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/CommonServiceImpl.java | 7 +------ .../com/cool/store/service/impl/ContentServiceImpl.java | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java index 2da05b5d6..2971809f4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java @@ -68,12 +68,7 @@ public class CommonServiceImpl implements CommonService { } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_4.getCode())) { return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "结束面试"); }else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_5.getCode())) { - HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId); - String intentionContractNo = null; - if(partnerCertificationInfoDO != null){ - intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo(); - } - return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "发起加盟商资质审核 | "+intentionContractNo); + return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "发起加盟商资质审核"); }else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_6.getCode())) { HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId); String intentionContractNo = null; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java index 56fbf9e2c..818f89b6b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java @@ -64,11 +64,6 @@ public class ContentServiceImpl implements ContentService { */ @Override public void updateContent(ContentUpdateDto dto) throws ApiException { - //增加不允许重复标题的逻辑 - Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle()); - if (isDuplicated) { - throw new ApiException(ErrorCodeEnum.CONTENT_DUPLICATED); - } HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); BeanUtil.copyProperties(dto, hyContentInfoDO); hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); From 67e624f93ee9e66953eb329ae4eba980f6f8f220 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 4 Jul 2023 17:45:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A1=A8=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 caf2af827..a0c668801 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 @@ -208,8 +208,11 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); //修改名称 HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(newPartnerId); + HyPartnerIntentInfoDO oldIntentInfo = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(oldLineInfo.getPartnerId(), oldLineInfo.getId()); if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername())){ hyPartnerUserInfoDO.setUsername(oldBaseInfo.getUsername()); + hyPartnerUserInfoDO.setWantShopArea(oldIntentInfo.getWantShopArea()); + hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType()); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); } hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo); From b3613549a97ebbed366358c61b6b9b4c9294e35d Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 4 Jul 2023 18:39:18 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=84=8F=E5=90=91?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/OperateTypeEnum.java | 4 +- .../cool/store/dto/log/WantInfoUpdateDTO.java | 89 +++++++++++++++++++ .../impl/HyPartnerIntentInfoServiceImpl.java | 17 ++++ 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java index 53b8d328d..bac7c5d30 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java @@ -29,8 +29,8 @@ public enum OperateTypeEnum { REJECT_INTERVIEW("reject_interview", "合作资格面试-拒绝并结束跟进", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REJECT_PUBLIC_REASON,REJECT_REAL_REASON, CERTIFY_FILE)), CREATE_QUALIFYVERIFY("create_qualifyverify", "合作资格面试-创建资格审核", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME,SUMMARY,QUALI_VERIFY_CONTENT)), USERINFO_UPDATE("userinfo_update", "修改（修改意向信息）", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_USERINFO_UPDATE, AFTER_USERINFO_UPDATE)), - INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)), - INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)), + INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)), + INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)), ADD_TAGS("add_tags", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)), ; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java new file mode 100644 index 000000000..992e4d49d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java @@ -0,0 +1,89 @@ +package com.cool.store.dto.log; + +import lombok.Data; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @Author: wxp + * @Date: 2023-06-30 10:23 + * @Description: + */ +@Data +@SuperBuilder +public class WantInfoUpdateDTO extends LogBasicDTO{ + + private BaseInfoUpdate beforeBaseInfoUpdate; + private BaseInfoUpdate afterBaseInfoUpdate; + + private IntentInfoUpdate beforeIntentInfoUpdate; + private IntentInfoUpdate afterIntentInfoUpdate; + + private ClerkUpdate beforeClerkUpdate; + private ClerkUpdate afterClerkUpdate; + + @Data + public static class BaseInfoUpdate{ + private Long id; + private String partnerId; + private Long partnerLineId; + private String mobile; + private String username; + private Integer sex; + private String nation; + private Date birthdate; + private String idCard; + private String idCardPhotoFront; + private String idCardPhotoBlack; + private String liveAddress; + private String userPortrait; + private Integer status; + private String latestLogMessage; + private String passReason; + private String certifyFile; + private Date passTime; + private String passUserId; + } + + @Data + public static class IntentInfoUpdate{ + private Long id; + private String partnerId; + private Long partnerLineId; + private String liveArea; + private String wantShopArea; + private Integer acceptAdjustType; + private Integer isHaveWantShop; + private String wantShopInfo; + private String maxBudget; + private String moneySource; + private String moneyProve; + private String education; + private String workYear; + private Integer isHaveWorkExp; + private String workExp; + private Integer isConsumer; + private String otherBand; + private String brandStrength; + private String needImprove; + private String strength; + private String weakness; + private String passCause; + private Date passTime; + private String passUser; + private String passCertifyFile; + } + + @Data + public static class ClerkUpdate{ + private Long id; + private Long partnerLineId; + private String partnerId; + private String username; + private String relationship; + private Integer age; + private String chooseReason; + } + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index e6b2c4512..f3d661b98 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.constants.RedisConstant; import com.cool.store.context.LoginUserInfo; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.dao.*; import com.cool.store.dto.log.AddTagsDTO; import com.cool.store.dto.log.LineLogInfo; import com.cool.store.dto.log.UserInfoUpdateDTO; +import com.cool.store.dto.log.WantInfoUpdateDTO; import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.HyPartnerIntentInfoDO; @@ -38,6 +40,7 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -72,6 +75,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic HyPhoneLocationService hyPhoneLocationService; @Resource HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; + @Autowired + private LogService logService; @Override public PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber) { @@ -186,14 +191,20 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); return null; } + WantInfoUpdateDTO.IntentInfoUpdate beforeIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate(); + WantInfoUpdateDTO.IntentInfoUpdate afterIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate(); + HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); if(intentInfoDO == null){ intentInfoDO = new HyPartnerIntentInfoDO(); fillIntentInfo(intentInfoDO, request); hyPartnerIntentInfoDAO.insertSelective(intentInfoDO); + BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate); }else { + BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate); fillIntentInfo(intentInfoDO, request); hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO); + BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate); } redisUtilPool.delKey(cacheKey); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId()); @@ -215,6 +226,12 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); } } + //记录日志 + PartnerUserInfoVO operator = PartnerUserHolder.getUser(); + WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) + .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) + .beforeIntentInfoUpdate(beforeIntentInfoUpdate).afterIntentInfoUpdate(afterIntentInfoUpdate).build(); + logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), OperateTypeEnum.INTENT_INFO_UPDATE,log); return hyPartnerLineInfoDO.getLineStatus(); } From 86278b7064030a941b1eb20c64dbe0ec39c7b23e Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 4 Jul 2023 19:11:47 +0800 Subject: [PATCH 7/8] changeBinding --- .../cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a0c668801..6d8eed05d 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 @@ -209,7 +209,8 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { //修改名称 HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(newPartnerId); HyPartnerIntentInfoDO oldIntentInfo = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(oldLineInfo.getPartnerId(), oldLineInfo.getId()); - if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername())){ + if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername()) || !hyPartnerUserInfoDO.getWantShopArea().equals(oldIntentInfo.getWantShopArea()) + || !hyPartnerUserInfoDO.getAcceptAdjustType().equals(oldIntentInfo.getAcceptAdjustType())){ hyPartnerUserInfoDO.setUsername(oldBaseInfo.getUsername()); hyPartnerUserInfoDO.setWantShopArea(oldIntentInfo.getWantShopArea()); hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType()); From 56464bead5ff089bddc29326ae87b384ec7c113d 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 19:31:05 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerLineInfoMapper.xml | 8 ++++---- .../store/service/impl/InterviewServiceImpl.java | 13 ++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index e79b606da..76778f863 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -593,10 +593,10 @@