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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-05-24 19:45:02 +08:00
parent f118576886 18e49783e3
commit 532eb01861
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java
View File

@@ -8,8 +8,10 @@ package com.cool.store.enums;
public enum SMSMsgEnum {
INTERVIEW_APPOINTMENT_SUCCESS("邀约面谈成功", "", "SMS_465930408"),
INTERVIEW_TIME_MODIFY("面谈时间修改", "", "SMS_467410046"),
FIRST_INTERVIEW_APPOINTMENT_SUCCESS("一次面审待预约", "", "SMS_465915456"),
FIRST_INTERVIEW_REMIND("一次面审1小时提醒", "", "SMS_465935440"),
FIRST_INTERVIEW_TIME_MODIFY("一审时间修改", "","SMS_467515078"),
FIRST_INTERVIEW_REAPPOINTMENT("一次面审重新预约", "", "SMS_465935442"),
INTENTION_PAYMENT("意向金待缴费", "", "SMS_465950414"),
INTENTION_PAYMENT_FAIL("意向金缴费失败", "", "SMS_465975442"),
@@ -20,6 +22,7 @@ public enum SMSMsgEnum {
SECOND_INTERVIEW_REMIND("二审前1小时提醒", "", "SMS_465925428"),
SECOND_INTERVIEW_REAPPOINTMENT("二审重新预约", "", "SMS_465940421"),
SECOND_INTERVIEW_SUCCESS("二审面审成功", "", "SMS_465980397"),
SECOND_INTERVIEW_TIME_MODIFY("二审时间修改", "", "SMS_467365053"),
SELECT_SUCCESS("选铺成功", "", "SMS_465950846"),
RENT_CONTRACT_AUDIT_FAIL("租赁合同上传未通过", "", "SMS_465955429"),
SHOP_EXPERIENCE("门店体验安排", "", "SMS_465905828"),
@@ -32,6 +35,7 @@ public enum SMSMsgEnum {
THREE_ACCEPTANCE_WAIT("三方验收待验收","","SMS_465961257"),
TRAINING_REGISTER_SUCCESS("培训登记中", "", "SMS_466035101"),
TRAINING_ASSESSMENT_SUCCESS("员工培训已完成", "", "SMS_465901266"),
;
private String title;

6
coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
View File

@@ -32,13 +32,11 @@
xfsg_line_calendars_event
where
<![CDATA[((start_time > #{startTime} and start_time < #{endTime}) or (end_time > #{startTime} and end_time < #{endTime}))]]>
and
interview_type = #{interviewType}
<if test="interviewType == 0">
and interviewer_user_id = #{interviewerUserId}
and interviewer_user_id = #{interviewerUserId} and interview_type in ('0')
</if>
<if test="interviewType == 1 or interviewType == 2">
and region_id = #{regionId}
and region_id = #{regionId} and interview_type in ('1', '2')
</if>
<if test="excludeInterviewId != null">
and id != #{excludeInterviewId}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
View File

@@ -222,6 +222,19 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
updateEvent.setEndTime(endTime);
updateEvent.setInterviewDate(startTime);
lineCalendarsEventDAO.updateCalendarsEvent(updateEvent);
Map<String, String> templateParam = new HashMap<>();
templateParam.put("interviewTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, startTime));
SMSMsgEnum smsMsgEnum = null;
if(InterviewTypeEnum.MEET.equals(interviewType)){
smsMsgEnum = SMSMsgEnum.INTERVIEW_TIME_MODIFY;
}
if(InterviewTypeEnum.INTERVIEW.equals(interviewType)){
smsMsgEnum = SMSMsgEnum.FIRST_INTERVIEW_TIME_MODIFY;
}
if(InterviewTypeEnum.SECOND_INTERVIEW.equals(interviewType)){
smsMsgEnum = SMSMsgEnum.SECOND_INTERVIEW_TIME_MODIFY;
}
commonService.sendSms(lineInfo.getMobile(), smsMsgEnum, templateParam);
return true;
}

4
coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -100,7 +100,7 @@ public class SignValidateFilter implements Filter {
String method = request.getMethod();
String userStr = "";
boolean isInWhiteList = excludePath(uri);
log.info("url:{}", uri);
log.info("url:{}, method:{}", uri, method);
if ( !isInWhiteList && !method.equals("OPTIONS")) {
String params = "";
if("GET".equalsIgnoreCase(method)){
@@ -136,7 +136,7 @@ public class SignValidateFilter implements Filter {
PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid);
if(partnerUserInfoVO != null){
userStr = JSONObject.toJSONString(partnerUserInfoVO);
log.info("url:{}, userStr:{}", uri, userStr);
log.info("userStr:{}", userStr);
}
}
try {

4
coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -100,7 +100,7 @@ public class TokenValidateFilter implements Filter {
currentUser = JSON.parseObject(userStr, LoginUserInfo.class);
}
}
log.info("url:{}", uri);
log.info("url:{}, method:{}", uri, method);
if ( !isInWhiteList && !method.equals("OPTIONS")) {
if (StringUtils.isEmpty(accessToken)) {
response.setStatus(HttpStatus.OK.value());
@@ -114,7 +114,7 @@ public class TokenValidateFilter implements Filter {
ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID)));
return;
}
log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName());
log.info("access_token:{}, userId:{}, username:{}", accessToken, currentUser.getUserId(), currentUser.getName());
}
if(StringUtils.isBlank(userStr) && !isInWhiteList){
response.setStatus(HttpStatus.OK.value());