From d32883f52fd5218e893c739fb7d82ae36dacb95c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Oct 2021 14:48:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2040484=20=E5=9B=BD=E9=99=85=E7=A0=94?= =?UTF-8?q?=E8=AE=A8=E4=BC=9A=E6=8A=A5=E5=AE=8C=E5=90=8D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E5=8C=85=E6=8B=AC=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E7=B3=BB=E7=BB=9F=E3=80=81=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) 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());