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 b5759236..36f634ce 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 @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; @@ -1791,16 +1792,24 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl selectionList.contains(item.getId())).collect(Collectors.toList()); } List exportList = new ArrayList<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(PayCompanyManagement::getId,PayCompanyManagement::getCompanyName); + List companyManagementList = companyManagementService.list(wrapper); + Map companyManagementMap = CollStreamUtil.toMap(companyManagementList, PayCompanyManagement::getId, PayCompanyManagement::getCompanyName); + + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.select(PayContactsManagement::getId,PayContactsManagement::getName,PayContactsManagement::getPost,PayContactsManagement::getPhone,PayContactsManagement::getEmail); + List contactsManagementList = contactsManagementService.list(wrapper1); + Map contactsManagementMap = CollStreamUtil.toIdentityMap(contactsManagementList, PayContactsManagement::getId); for (PayMeetingSituation meetingSituation : pageList) { String companyContactId = meetingSituation.getCompanyContactId(); - PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId); + PayContactsManagement contactsManagement = contactsManagementMap.get(companyContactId); meetingSituation.setCompanyContactName(contactsManagement.getName()); meetingSituation.setPost(contactsManagement.getPost()); meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); - PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId()); - meetingSituation.setCompanyName(companyManagement.getCompanyName()); + meetingSituation.setCompanyName(companyManagementMap.get(contactsManagement.getCompanyId())); String checkFile = meetingSituation.getCheckFile(); if (StringUtils.isNotBlank(checkFile)) { OSSFile ossFile = ossFileService.getById(checkFile); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 94ff4897..4b2476bf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -612,12 +612,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl typr5List = new ArrayList<>(); - BeanUtils.copyProperties(payPaymentRecord,tbCheckVo); - tbCheckVo.setId(tbMember.getTbPaymentId()); - tbCheckVo.setCheckMark(payPaymentRecord.getReviewInstructions()); - typr5List.add(tbCheckVo); - payPaymentRecordService.pushToStandards(typr5List); + //List typr5List = new ArrayList<>(); + //BeanUtils.copyProperties(payPaymentRecord,tbCheckVo); + //tbCheckVo.setId(tbMember.getTbPaymentId()); + //tbCheckVo.setCheckMark(payPaymentRecord.getReviewInstructions()); + //typr5List.add(tbCheckVo); + //payPaymentRecordService.pushToStandards(typr5List); break; //标协证书 @@ -690,13 +690,13 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl typr6List = new ArrayList<>(); - BeanUtils.copyProperties(payPaymentRecord,tbCheckCerVo); - tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId()); - tbCheckCerVo.setCheckMark(payPaymentRecord.getReviewInstructions()); - typr6List.add(tbCheckCerVo); - JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List); + ////拼装推到标协缴费的参数 + //List typr6List = new ArrayList<>(); + //BeanUtils.copyProperties(payPaymentRecord,tbCheckCerVo); + //tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId()); + //tbCheckCerVo.setCheckMark(payPaymentRecord.getReviewInstructions()); + //typr6List.add(tbCheckCerVo); + //JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List); break; default:break; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index df795f5c..fea9f90a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -1176,18 +1176,18 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl typr5List){ - JSONObject jsonObject = AuthenticationUtils.postResult("/paymentInfo/incomingPaymentCheckMember", null, typr5List); - String memberNo = jsonObject.getString("memberNo"); - Integer memberType = jsonObject.getInteger("memberType"); - Integer memberStatus = jsonObject.getInteger("memberStatus"); - MemberInfo memberInfo = new MemberInfo(); - memberInfo.setMemberNo(memberNo); - memberInfo.setMemberType(memberType); - memberInfo.setMemberStatus(memberStatus); - for (TbCheckVo tbCheckVo : typr5List) { - String id = tbCheckVo.getId(); - updateStandards(id,memberInfo); - } + //JSONObject jsonObject = AuthenticationUtils.postResult("/paymentInfo/incomingPaymentCheckMember", null, typr5List); + //String memberNo = jsonObject.getString("memberNo"); + //Integer memberType = jsonObject.getInteger("memberType"); + //Integer memberStatus = jsonObject.getInteger("memberStatus"); + //MemberInfo memberInfo = new MemberInfo(); + //memberInfo.setMemberNo(memberNo); + //memberInfo.setMemberType(memberType); + //memberInfo.setMemberStatus(memberStatus); + //for (TbCheckVo tbCheckVo : typr5List) { + // String id = tbCheckVo.getId(); + // updateStandards(id,memberInfo); + //} }