LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 会议发送通知

Browse Source
This commit is contained in:
lijiarao
2021-09-26 14:03:47 +08:00
parent dfda96bd86
commit d962960ef5
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class HuaWeiSmsUtil {
//传进来为秒数所以除以60
String verificationTime = this.resVerificationTime(codeTime);
//解密手机号
phone = PasswordUtil.decrypt(phone);
//phone = PasswordUtil.decrypt(phone);
long expire = redisUtil.getExpire("_verification:_phone:" + phone);
//值为-2代表没有此数据
if (expire != -2){
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+15 -13
View File
@@ -230,14 +230,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (isSubItem) {
//不是汇款和线上缴费
if (payMeetingSituation.getPayMode().equals(MeetingSubitemCommon.PAY_MODE_3)){
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG4);
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG4,"C_OPEN_TYPE4");
}
}else {
//不是汇款和线上缴费
if (payMeetingSituation.getPayMode().equals(MeetingSubitemCommon.PAY_MODE_3)){
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG2);
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG2,"C_OPEN_TYPE2");
}else {
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG3);
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG3,"C_OPEN_TYPE3");
}
}
}
@@ -254,7 +254,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
*/
public void sendMessage(PayMeeting payMeeting,
PayMeetingSituation payMeetingSituation,
CompanyMessageEnums companyMessageEnums) {
CompanyMessageEnums companyMessageEnums,
String busType) {
String companyContactId = payMeetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
String phone = contactsManagement.getPhone();
@@ -272,7 +273,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
sendMessageDTO.setFromUser(payMeeting.getDirectorName());
sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("email");
sendMessageDTO.setBusType(busType);
sendMessageDTO.setBusId(payMeetingSituation.getId());
sendMessageService.SendMessageService(sendMessageDTO);
}
@@ -296,14 +297,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (StrUtil.isBlank(paymentRecord)) {
throw new JeroBootException("付款凭证为空不能审核");
}
Integer checkResult1 = payMeetingSituation.getCheckResult();
if (checkResult1.equals(PayProjectCommon.YES)) {
Integer oldCheckResult = payMeetingSituation.getCheckResult();
if (oldCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("审核通过之后就无法在审核");
}
Integer checkResult = checkVO.getCheckResult();
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
//汇款凭证审核不通过
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG5);
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG5,"C_OPEN_TYPE5");
} else {
//设置到账
@@ -322,7 +323,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//添加来款
payPaymentRecordService.addAmountReceived(payPaymentRecords);
//非成员单位审核通过且上传的缴费凭证审核通过也发送。（即需要审核的都审核通过才发送）
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG6);
sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG6,"C_OPEN_TYPE6");
}
}
@@ -529,7 +530,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
sendMessageDTO.setFromUser(sysUser.getId());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG8.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("email");
sendMessageDTO.setBusType("M_OPEN_TYPE8");
sendMessageDTO.setBusId(id);
sendMessageService.SendMessageService(sendMessageDTO);
}
@@ -620,13 +621,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer payMode = commonPeopleVO.getPayMode();
payMeetingSituation1.setPayMode(payMode);
//缴费方式为打包时，不处理邮寄联系人和地址
if (payMode.equals(MeetingSubitemCommon.PAY_MODE_3)) {
if (Objects.equals(payMode,MeetingSubitemCommon.PAY_MODE_3)) {
ValidUtil.validate(commonPeopleVO);
//存入打包字段
payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
payMeetingSituation1.setAmountReceivable(new BigDecimal(0));
} else {
//缴费方式为汇款或线上缴费
} else if (Objects.equals(payMode,MeetingSubitemCommon.PAY_MODE_1)
||Objects.equals(payMode,MeetingSubitemCommon.PAY_MODE_2)){
ValidUtil.validate(commonPeopleVO, NotPack.class);
//缴费方式为线上缴费时，判断是否为会议期间
String paymentRecord = payMeetingSituation.getPaymentRecord();