update 需求变更新增参会人时，选择打包后可以选择发票

2021-11-03 11:33:39 +08:00
parent 405bf617af
commit 4fcc5ff99c
2 changed files with 14 additions and 7 deletions
@@ -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);

@@ -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 {
                //缴费方式为线上缴费时，判断是否为会议期间