diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java index 69e400595..6687e6e37 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java @@ -15,7 +15,7 @@ import java.util.List; @Data public class GetFreeBusyListVO { - @ApiModelProperty("日期列表(默认七天,只有请求参数中查询日期不传时才会返回,否则不返回)") + @ApiModelProperty("忙闲列表") private List calendarList; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 0384650b3..07634d13b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -9,10 +9,7 @@ import com.cool.store.dto.calendar.*; import com.cool.store.dto.message.SendCardMessageDTO; import com.cool.store.dto.partner.EnterInterviewDto; import com.cool.store.entity.*; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.MessageTypeEnum; -import com.cool.store.enums.RoomStatus; -import com.cool.store.enums.WorkflowStatusEnum; +import com.cool.store.enums.*; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.http.ISVHttpRequest; @@ -318,6 +315,13 @@ public class InterviewServiceImpl implements InterviewService { hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.RESERVATION_1.getCode())); hyPartnerInterviewMapper.insertSelective(hyPartnerInterviewDO); + //修改线索状态 + HyPartnerLineInfoDO hyPartnerLineDO = new HyPartnerLineInfoDO(); + hyPartnerLineDO.setId(request.getPartnerLineId()); + hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_1.getCode()); + hyPartnerLineDO.setUpdateTime(new Date()); + hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO); + //异步发送飞书信息给面试官 InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewPlanId)); List userIds = new ArrayList<>(); @@ -376,6 +380,14 @@ public class InterviewServiceImpl implements InterviewService { hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_2.getCode())); hyPartnerInterviewDO.setUpdateTime(new Date()); hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); + + //更新线索状态 + HyPartnerLineInfoDO hyPartnerLineDO = new HyPartnerLineInfoDO(); + hyPartnerLineDO.setId(request.getPartnerLineId()); + hyPartnerLineDO.setWorkflowStage(WorkflowStageEnum.INTERVIEW.getCode()); + hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.INTERVIEW_2.getCode()); + hyPartnerLineDO.setUpdateTime(new Date()); + hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO); //异步发送短信给加盟商 InterviewSmsReq interviewSmsReq = new InterviewSmsReq(); interviewSmsReq.setInterviewStartTime(DateUtil.format(DateUtil.parse(interviewVO.getStartTime()), DatePattern.NORM_DATETIME_MINUTE_PATTERN)); diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index 0991b3bfc..f35ea35cb 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -73,3 +73,8 @@ xxl.job.accessToken = hs.mdm.baseUrl=http://10.56.21.30/ hs.mdm.appkey = HSAYPartner hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 + +#sms +hs.sms.accessKeyId = LTAI4GEZKz9PBqqKa3hjup3W +hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb +hs.sms.templateCode = SMS_461530041 diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index 509de0852..0fa71c1b6 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -61,7 +61,5 @@ weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=77fea013c3a6459685b83c21a2fc3411 -#MDM -hs.mdm.baseUrl=http://10.56.21.30/ -hs.mdm.appkey = HSAYPartner -hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 \ No newline at end of file +#飞书通知 +feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench \ No newline at end of file