From 8868315cb9967386ab0ab111db856a80627af8c3 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 14 Oct 2021 15:11:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E5=A6=82=E6=9E=9C=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E8=B4=B9=E7=94=A8=E4=B8=BA0=E5=88=99=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=8A=E4=BC=A0=E6=94=B6=E6=AC=BE=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingServiceImpl.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 25cf9edd..f77a762a 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
@@ -47,6 +47,7 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -209,7 +210,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 
 	@NotNull
 	private PayMeeting getPayMeeting(PayMeetingVO payMeetingVO, List<PayMeetingHotelContacts> hotelContactsList) {
-		List<String> errorMsgList = new ArrayList<>();
 		PayMeeting payMeeting = new PayMeeting();
 		//判断会议名称
 		String meetingName = payMeetingVO.getMeetingName();
@@ -239,6 +239,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			payMeetingVO.setDirectorName(loginUser.getUsername());
 			payMeetingVO.setDirectorPhone(loginUser.getPhone());
 		}
+		//如果会议费用为0则不可上传收款二维码
+		if (payMeetingVO.getMeetingCosts().compareTo(BigDecimal.ZERO) < 1){
+			if (StringUtils.isNotBlank(payMeetingVO.getPaymentQrCode())){
+				throw new JeroBootException("会议费用为0时，不可上传收款二维码");
+			}
+		}
 
 		//根据会议类型进行校验
 		switch (meetingType) {
@@ -301,10 +307,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			default:
 		}
 
-
-		if (!errorMsgList.isEmpty()){
-			throw new JeroBootException(errorMsgList.toString());
-		}
 		BeanUtils.copyProperties(payMeetingVO,payMeeting);
 		return payMeeting;
 	}