From 4fcc5ff99cb459ef13768b987d9c16d7486de89b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 3 Nov 2021 11:33:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=8F=82=E4=BC=9A=E4=BA=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E6=89=93=E5=8C=85=E5=90=8E=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/util/AuthenticationUtils.java  |  7 ++++++-
 .../impl/PayMeetingSituationServiceImpl.java       | 14 ++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
index ea519e88..011c7497 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
@@ -77,8 +77,13 @@ public class AuthenticationUtils {
     public static Map<String,String> encryptByRsaPriKey() {
 
         Map<String,String> map= new HashMap<>();
+        String publicKey;
         //从标协项目获取公钥
-        String publicKey=HttpUtil.get(URL+"/sys/getStandardsRSAPublicKey");
+        try {
+            publicKey=HttpUtil.get(URL+"/sys/getStandardsRSAPublicKey");
+        }catch (Exception e){
+            throw new JeroBootException("数据同步失败！连接超时");
+        }
 
         RSA rsa = new RSA(null,publicKey);
 
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 2ffcf81b..12413e07 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
@@ -1005,12 +1005,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 if (Objects.isNull(payIncomeContract)) {
                     throw new JeroBootException("合同不存在！");
                 }
-                //合同添加的参会人，付款凭证和订单号后四位必填
-                if (StringUtils.isBlank(paymentRecord)) {
-                    throw new JeroBootException("付款凭证必填");
-                }
-                if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isBlank(orderCode)) {
-                    throw new JeroBootException("订单号后四位必填");
+                if (!payMode.equals(MeetingSubitemCommon.PAY_MODE_3)){
+                    //合同添加的参会人，付款凭证和订单号后四位必填
+                    if (StringUtils.isBlank(paymentRecord)) {
+                        throw new JeroBootException("付款凭证必填");
+                    }
+                    if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isBlank(orderCode)) {
+                        throw new JeroBootException("订单号后四位必填");
+                    }
                 }
             } else {
                 //缴费方式为线上缴费时，判断是否为会议期间