diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index cf2e804d..042e73e8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -283,24 +283,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); - wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId()); - boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0; + //判断是否发送消息,工作组和分标委特殊处理 + if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING)) + || meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { + Integer registerCheckResult = payMeetingSituation1.getRegisterCheckResult(); + boolean isSubItem = Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1); judgeSend(payMeeting, payMeetingSituation1, isSubItem); - - } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { - //分标委以人为维度 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); - wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId()); - - int count = payCaseCommitteeSubitemService.count(wrapper); - if (count > 0) { - payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); + } else { + Integer payMode = payMeetingSituation.getPayMode(); + //不是汇款和线上缴费 + boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2); + if (payModeBoolean) { + sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4"); } } //上传付款凭证发送邮件提醒审批 @@ -932,11 +926,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); 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); if (count <= 0) { payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); } - } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());