suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
俞扬
2023-07-04 17:37:25 +08:00
parent f544530b0e 91e77766ec
commit 37b8169a48
18 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
View File

@@ -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;
/**
* 生成一条默认线索

16
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
View File

@@ -213,11 +213,17 @@ 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);
redisUtilPool.delKey(cacheKeyBaseInfo);
redisUtilPool.delKey(cacheKeyClerkInfo);
redisUtilPool.delKey(cacheKeyIntentInfo);
return true;
}

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -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;