From 4d7e7c8f94dcd8b1754c24fba51c080993beda4d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Nov 2021 11:57:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE=E4=B8=8A=E4=BC=A0=E6=B1=87=E6=AC=BE?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=90=8E=E6=9B=B4=E6=96=B0=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      |  4 ++-
 .../meeting/entity/PayMeetingSituation.java   |  3 +++
 .../impl/PayMeetingSituationServiceImpl.java  | 26 ++++++++++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

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 62ca9d07..803f19b4 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
@@ -148,7 +148,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 }else if (Objects.equals(registerCheckResult,2)){
                     meeting.setSignUpStatus(3);
                 //    待上传凭证：来款方式为：汇款/线上缴费。需要上传审核凭证的
-                }else if (Objects.equals(registerCheckResult,1)&&StringUtils.isBlank(paymentRecord)){
+                }else if (Objects.equals(registerCheckResult,1)
+                        &&StringUtils.isBlank(paymentRecord)
+                        &&!Objects.equals(checkResult,1)){
                     meeting.setSignUpStatus(4);
                 //    凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
                 }else if (Objects.equals(checkResult,2)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index ffe9f7f2..a07ee912 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -427,4 +427,7 @@ public class PayMeetingSituation implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "打包年份")
     private String packYear;
+
+    @TableField(exist = false)
+    private Boolean isZero;
 }
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 e9b836fb..f768bdb4 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
@@ -258,6 +258,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     }
 
     private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
+        if (payMeetingSituation1.getIsZero()) {
+            payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
+        }
         payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
         payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
 
@@ -952,17 +955,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         canHuiContact(payMeetingSituation1, companyId, contactsManagement);
         //处理付款凭证
         payMeetingSituation1.setPaymentRecord(null);
-        //处理应收金额为0
-        BigDecimal amountReceivable = payMeetingSituation1.getAmountReceivable();
-        boolean isZero = false;
-        if (Objects.nonNull(amountReceivable)) {
-            isZero = amountReceivable.compareTo(new BigDecimal("0.00")) == 0;
-        }
+
         //存入打包字段
         payMeetingSituation1.setPack(PayProjectCommon.PACKAGING0);
         payMeetingSituation1.setNeedInvoice(PayProjectCommon.NO);
         //判断身份
         Integer identity = payMeetingSituation.getIdentity();
+        payMeetingSituation1.setIsZero(true);
         //国际研讨会会议的嘉宾和其他类型不同
         if (meetingType.equals(Integer.parseInt(MeetingCommon.INTERNATIONAL_MEETING)) &&
                 identity.equals(MeetingSubitemCommon.JIA_BIN)) {
@@ -1011,6 +1010,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
             //    参会人
         } else if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)) {
+            boolean checkMember = false;
+            boolean isZero;
+            if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+                checkMember = checkMember(payMeetingSituation1.getCompanyName());
+            }
+            if (checkMember){
+                BigDecimal meetingCostsVip = payMeeting.getMeetingCostsVip();
+                isZero = meetingCostsVip.compareTo(new BigDecimal("0.00")) == 0;
+            }else {
+                BigDecimal meetingCosts = payMeeting.getMeetingCosts();
+                isZero = meetingCosts.compareTo(new BigDecimal("0.00")) == 0;
+            }
+            payMeetingSituation1.setIsZero(isZero);
             CommonPeopleVO commonPeopleVO = new CommonPeopleVO();
             BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);
             Integer payMode = commonPeopleVO.getPayMode();
@@ -1063,7 +1075,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
                 //根据企业名称和会员类型不为null判断是否为标协会员
                 //如果是标协会员就存入会议费用（标协会员）
-                if (checkMember(payMeetingSituation1.getCompanyName())) {
+                if (checkMember) {
                     payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip());
                 } else {
                     payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());