From 858279791eb711440a5ac17e8dd7d8a2a997fae7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Sep 2021 15:44:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E5=B9=B6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=A0=A1=E9=AA=8C,=E7=BF=BB=E8=BD=ACequals?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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 07001fde..8abb59a7 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
@@ -22,6 +22,8 @@ import com.jero.meeting.service.IPayMeetingService;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.meeting.valid.group.*;
 import com.jero.meeting.vo.*;
+import com.jero.payment.entity.PayPaymentRecord;
+import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.standards.memberinfo.service.IMemberInfoService;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
@@ -67,6 +69,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private ISysBaseAPI iSysBaseApi;
     @Resource
     private IPayMailBillService payMailBillService;
+    @Resource
+    private IPayPaymentRecordService payPaymentRecordService;
 
     /**
      * 保存
@@ -148,6 +152,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
         meetingSituation.setCheckResult(checkResult);
         saveOrUpdate(meetingSituation);
+        PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
+        payPaymentRecord.setProjectId(meetingSituation.getId());
+        payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
+        payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable());
+        payPaymentRecord.setPaymentDate(new Date());
+
+        payPaymentRecordService.addPhase(payPaymentRecord);
     }
 
     @Override
@@ -171,16 +182,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (!payMeetingSituation1.getCompanyId().equals(payMeetingSituation.getCompanyId())) {
                 throw new JeroBootException("合并开票只能是同一企业");
             }
-            if (amountReceivable.equals(new BigDecimal("0"))) {
+            if (amountReceivable.compareTo(new BigDecimal("0")) == 0) {
                 throw new JeroBootException("应收金额为0，不能合并开票");
             }
-            if (payMeetingSituation1.getPayMode().equals(MeetingSubitemCommon.PAY_MODE_PACK)) {
+            if (MeetingSubitemCommon.PAY_MODE_PACK.equals(payMeetingSituation1.getPayMode())) {
                 throw new JeroBootException("缴费方式为打包，不能合并开票");
             }
-            if (payMeetingSituation1.getNeedInvoice().equals(PayProjectCommon.NO)) {
+            if (PayProjectCommon.NO.equals(payMeetingSituation1.getNeedInvoice())) {
                 throw new JeroBootException("不需要发票，不能合并开票");
             }
-            if (!payMeetingSituation1.getMakeInvoice().equals(PayProjectCommon.NO)) {
+            if (!PayProjectCommon.NO.equals(payMeetingSituation1.getMakeInvoice())) {
                 throw new JeroBootException("已经开票的，不能合并开票");
             }
             allAmount = amountReceivable.add(allAmount);