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

fix bug 40484 国际研讨会报完名没有发送消息包括邮件、系统、短信

Browse Source
This commit is contained in:
lijiarao
2021-10-14 14:48:55 +08:00
parent a093c44f2b
commit d32883f52f
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+17 -18
View File
@@ -283,24 +283,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//处理打包 //处理打包
handlePack(payMeetingSituation1); handlePack(payMeetingSituation1);
Integer identity = payMeetingSituation1.getIdentity(); Integer identity = payMeetingSituation1.getIdentity();
//如果是参会人判断是上传了缴费凭证 //判断是否发送消息，工作组和分标委特殊处理
if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) { if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))
//工作组以公司为维度 || meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>(); Integer registerCheckResult = payMeetingSituation1.getRegisterCheckResult();
wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); boolean isSubItem = Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1);
wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0;
judgeSend(payMeeting, payMeetingSituation1, isSubItem); judgeSend(payMeeting, payMeetingSituation1, isSubItem);
} else {
} else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { Integer payMode = payMeetingSituation.getPayMode();
//分标委以人为维度 //不是汇款和线上缴费
LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>(); boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); if (payModeBoolean) {
wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId()); sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
int count = payCaseCommitteeSubitemService.count(wrapper);
if (count > 0) {
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
} }
} }
//上传付款凭证发送邮件提醒审批 //上传付款凭证发送邮件提醒审批
@@ -932,11 +926,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId());
wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId()); wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
wrapper.and(i -> i.eq(PayWorkingGroupSubItem::getContactsIdOne, payMeetingSituation1.getCompanyContactId())
.or()
.eq(PayWorkingGroupSubItem::getContactsIdTwo, payMeetingSituation1.getCompanyContactId())
.or()
.eq(PayWorkingGroupSubItem::getContactsIdThree, payMeetingSituation1.getCompanyContactId())
);
int count = payWorkingGroupSubItemService.count(wrapper); int count = payWorkingGroupSubItemService.count(wrapper);
if (count <= 0) { if (count <= 0) {
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
} }
} else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());