diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java
index b47279277..f1b347b6c 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java
@@ -1,11 +1,13 @@
package com.cool.store.mapper;
import com.cool.store.entity.DingdingUserDO;
+import org.apache.ibatis.annotations.Mapper;
/**
* @author zhangchenbiao
* @date 2023-06-15 10:03
*/
+@Mapper
public interface DingdingUserMapper {
/**
*
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java
index f199e3811..a7bd18eec 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java
@@ -55,5 +55,5 @@ public interface HyPartnerTaskInfoLogMapper {
* @param partnerLineId
* @return
*/
- HyPartnerTaskInfoLogDO getLastTipsLog(Long partnerLineId);
+ HyPartnerTaskInfoLogDO getLastTipsLog(@Param("lineId") Long partnerLineId);
}
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml
index 14df1102a..4979c4b38 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml
@@ -168,7 +168,7 @@
SELECT ,
FROM `hy_partner_task_info_log`
WHERE deleted = 0
- AND partner_line_id = 38711
+ AND partner_line_id = #{lineId}
AND operate_type IN (
'interview_appointment',
'interview_appointment_agreement',
@@ -176,7 +176,8 @@
'interviewer_book_interview',
'modify_interview_time',
'finish_interview',
- 'create_qualifyverify'
+ 'create_qualifyverify',
+ 'exhibition_create_qualifyverify'
)
ORDER BY create_time DESC LIMIT 1
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java
index 3306bb895..cd1387c49 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java
@@ -119,4 +119,7 @@ public class CreateQualifyVerifyReq {
@ApiModelProperty(value = "实控人手机号", required = true)
private String skrPhone;
+ @ApiModelProperty(value = "是否由会销发起审批", required = false)
+ private Boolean whetherExhibition;
+
}
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 6a1c0b64e..1875ef420 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
@@ -16,7 +16,6 @@ import com.cool.store.request.GetTipsInfoReq;
import com.cool.store.service.CommonService;
import com.cool.store.utils.StringUtil;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -73,7 +72,7 @@ public class CommonServiceImpl implements CommonService {
if (partnerExhibitionDO == null || partnerExhibitionDO.getParticipationStatus().compareTo(ExhibitionPartnerStatus.INTERVIEWING.getCode()) < 0) {
return getCommonTipsFix(Long.parseLong(request.getPartnerLineId()));
} else {
- return getExhibitionTipsInfo(workflowStage, workflowStatus, partnerLineId);
+ return getExhibitionTipsInfoFix(Long.parseLong(request.getPartnerLineId()));
}
}
@@ -94,19 +93,54 @@ public class CommonServiceImpl implements CommonService {
interviewTips = getInterviewTipsFix(lastLog, "于", "修改面试预约时间");
break;
case INTERVIEW_APPOINTMENT_AGREEMENT:
- interviewTips = getInterviewTipsFix(lastLog, "于", "同意面试预约申请");
+ interviewTips = getInterviewTipsFix(lastLog, "于", "同意了客户的预约面试申请");
break;
case AUTO_OPEN_INTERVIEW:
- interviewTips = getInterviewTipsFix(lastLog, "面试房间于", "正式开放");
+ interviewTips = getInterviewTipsFix(lastLog, "面试房间于", "正式开放").trim();
break;
case FINISH_INTERVIEW:
interviewTips = getInterviewTipsFix(lastLog, "于", "结束面试");
break;
- case QUALIFYVERIFY_PASS:
- interviewTips = getInterviewTipsFix(lastLog, "于", "审核通过");
+ case CREATE_QUALIFYVERIFY:
+ interviewTips = getInterviewTipsFix(lastLog, "于", "发起加盟商资质审核");
break;
- case QUALIFYVERIFY_REJECT:
- interviewTips = getInterviewTipsFix(lastLog, "于", "审核拒绝");
+ case QUALIFYVERIFY_PASS:
+ HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId);
+ String intentionContractNo = null;
+ if(partnerCertificationInfoDO != null){
+ intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo();
+ }
+ interviewTips = getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | " + intentionContractNo);
+ break;
+ default:
+ break;
+ }
+ return interviewTips;
+ }
+
+ private String getExhibitionTipsInfoFix(Long partnerLineId) {
+ String interviewTips = "";
+ //1. 查询需要展示的操作类型最新一条
+ HyPartnerTaskInfoLogDO lastLog = hyPartnerTaskInfoLogMapper.getLastTipsLog(partnerLineId);
+ //2. 判断类型并返回对应的tips
+ OperateTypeEnum operateType = OperateTypeEnum.getOperateTypeEnum(lastLog.getOperateType());
+ switch (operateType) {
+ case INTERVIEWER_BOOK_INTERVIEW:
+ interviewTips = getInterviewTipsFix(lastLog, "通过展会于", "发起面试");
+ break;
+ case FINISH_INTERVIEW:
+ interviewTips = getInterviewTipsFix(lastLog, "通过展会于", "结束面试");
+ break;
+ case EXHIBITION_CREATE_QUALIFYVERIFY:
+ interviewTips = getInterviewTipsFix(lastLog, "通过展会于", "发起加盟商资质审核");
+ break;
+ case QUALIFYVERIFY_PASS:
+ HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId);
+ String intentionContractNo = null;
+ if(partnerCertificationInfoDO != null){
+ intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo();
+ }
+ interviewTips = getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | " + intentionContractNo);
break;
default:
break;
@@ -149,7 +183,8 @@ public class CommonServiceImpl implements CommonService {
return MessageFormat.format(content, params.toArray());
}
- //普通线索
+ //普通线索
+ @Deprecated
private String getCommonTipsInfo(String workflowStage, String workflowStatus, Long partnerLineId) {
String interviewTips = "";
//1. 预约面试待审核
@@ -200,6 +235,7 @@ public class CommonServiceImpl implements CommonService {
}
//会销面试线索，通过会销进行面试的线索已开始就是面试已开始状态
+ @Deprecated
private String getExhibitionTipsInfo(String workflowStage, String workflowStatus, Long partnerLineId) {
String interviewTips = "";
//1. 面试已开始
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
index 314dde535..591b3e814 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
@@ -253,7 +253,12 @@ public class FlowServiceImpl implements FlowService {
//记录日志
CreateQualifyVerifyDTO log = CreateQualifyVerifyDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
.summary(request.getSummary()).qualiVerifyContent(JSON.toJSONString(partnerCertificationInfoDO)).build();
- logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.CREATE_QUALIFYVERIFY,log);
+ //是否由会销发起面试
+ if (request.getWhetherExhibition() == null || Boolean.FALSE.equals(request.getWhetherExhibition())) {
+ logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.CREATE_QUALIFYVERIFY, log);
+ } else {
+ logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.EXHIBITION_CREATE_QUALIFYVERIFY, log);
+ }
}
@Override