From c4620ed4d54bb7fa930746f008434f00f14d639b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Sep 2021 15:18:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=88=E5=B9=B6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=8F=82=E4=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E9=82=AE=E5=AF=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 8e6f5d8a..f1933302 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
@@ -150,8 +150,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		List<String> meetingSituationIds = mergePayBillVO.getMeetingSituationIds();
 		List<PayMeetingSituation> payMeetingSituations = listByIds(meetingSituationIds);
 		if (payMeetingSituations.isEmpty()){
-			throw new JeroBootException("参会人不正确");
+			throw new JeroBootException("未选择参会人");
 		}
+		//判断所选参会人是否符合条件
 		PayMeetingSituation payMeetingSituation = payMeetingSituations.get(0);
 		String meetingId = payMeetingSituation.getMeetingId();
 		StringBuilder projectIds = new StringBuilder();
@@ -184,6 +185,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 				projectIds.append(",");
 			}
 		}
+		//查询邮寄联系人
+		String postContactId = mergePayBillVO.getPostContactId();
+		String postContactAddress = mergePayBillVO.getPostContactAddress();
+		PayContactsManagement contactsManagement = contactsManagementService.getById(postContactId);
+		String postContactName = contactsManagement.getName();
+		//更新参会人信息的邮寄联系人
+		for (PayMeetingSituation meetingSituation : payMeetingSituations) {
+			meetingSituation.setPostContactId(postContactId);
+			meetingSituation.setPostContactName(postContactName);
+			meetingSituation.setPostContactAddress(postContactAddress);
+			saveOrUpdate(meetingSituation);
+		}
 		//删除最后一位","
 		//projectIds.deleteCharAt(projectIds.length()-1);