From 44acf331649747f37748421688911029701b3185 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 15 Dec 2021 16:47:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=A5=E5=90=8D=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/config/shiro/ShiroConfig.java    |  4 ++--
 .../controller/PayMeetingController.java      |  9 +++-----
 .../impl/PayMeetingSituationServiceImpl.java  | 22 +++++++++----------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index bcc90eaf..dcbfa70f 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -108,8 +108,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/company/jscode2session", "anon");//微信登录凭证校验
 
         //和会员系统交互的接口
-        filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议
-        filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件
+        //filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议
+        //filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件
         filterChainDefinitionMap.put("/meeting/payMeetingSituation/page2","anon");//查询参会人
         filterChainDefinitionMap.put("/sys/user/payUserList","anon");//查询负责人
         filterChainDefinitionMap.put("/meeting/payMeeting/createBase64","anon");//生成二维码
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index b4da0beb..a6727a9f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -410,9 +410,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
      */
     @PostMapping(value = "/addStandards")
     public Result<?> addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) {
-        String publicKey = request.getParameter("publicKey");
-        String token = request.getParameter("token");
-        authenticationUtils.check(token, publicKey);
+        //String publicKey = request.getParameter("publicKey");
+        //String token = request.getParameter("token");
+        //authenticationUtils.check(token, publicKey);
 
         payMeetingService.addStandards(payMeeting);
         return Result.OK("合并开票成功!");
@@ -423,9 +423,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
      */
     @PostMapping(value = "/addStandardsFile")
     public Result<?> addStandardsFile(@RequestBody List<OSSFile> ossFileList, HttpServletRequest request) {
-        String publicKey = request.getParameter("publicKey");
-        String token = request.getParameter("token");
-        authenticationUtils.check(token, publicKey);
         for (OSSFile ossFile : ossFileList) {
             iossFileService.saveOrUpdate(ossFile);
         }
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 68235b36..5417aa2c 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
@@ -265,7 +265,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     }
 
     private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
-
+        if (payMeetingSituation1.getIsZero()) {
+            payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
+            payMeetingSituation1.setRegisterProcess(12);
+        }else {
+            if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+                payMeetingSituation1.setRegisterProcess(3);
+            }else {
+                payMeetingSituation1.setRegisterProcess(1);
+            }
+        }
         payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
         payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
 
@@ -1193,17 +1202,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
         }
-        if (payMeetingSituation1.getIsZero()) {
-            payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
-            payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
-            payMeetingSituation1.setRegisterProcess(12);
-        }else {
-            if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
-                payMeetingSituation1.setRegisterProcess(3);
-            }else {
-                payMeetingSituation1.setRegisterProcess(1);
-            }
-        }
         return payMeetingSituation1;
     }