diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 95dcf4d3..24cd6f81 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -52,7 +52,9 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService; @@ -125,6 +127,8 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, groupSubItemId); + List groupSubItemContactsList = workingGroupSubItemContactsService.list(wrapper1); + for (PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts : groupSubItemContactsList) { + String contactsId = payWorkingGroupSubItemContacts.getContactsId(); + contactsIdList.add(contactsId); meetingRemindRecordList.add( new PayMeetingRemindRecord() .setSubitemId(groupSubItemId) - .setContactId(contactsIdOne) - ); - - } - String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo(); - if (StringUtils.isNotBlank(contactsIdTwo)) { - contactsIdList.add(contactsIdTwo); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(groupSubItemId) - .setContactId(contactsIdTwo) - ); - } - String contactsIdThree = payWorkingGroupSubItem.getContactsIdThree(); - if (StringUtils.isNotBlank(contactsIdThree)) { - contactsIdList.add(contactsIdThree); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(groupSubItemId) - .setContactId(contactsIdThree) + .setContactId(contactsId) ); } } 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 2685bb8a..a88edc81 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 @@ -62,6 +62,8 @@ import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.memberinfo.service.IMemberInfoService; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -138,6 +140,8 @@ 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); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId, payMeeting.getWorkingGroupId()); + wrapper.eq(PayWorkingGroupSubItemContacts::getContactsId, payMeetingSituation1.getCompanyContactId()); + int count = workingGroupSubItemContactsService.count(wrapper); if (count <= 0) { payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); }