From 867e2d627bbc7942b24d37b6160549a17103a386 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 4 Sep 2025 17:44:53 +0800
Subject: [PATCH] md

---
 .../impl/EmisSettleBillServiceImpl.java       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
index 8fc527081..17408aef7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
@@ -863,14 +863,13 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
         log.debug("reCalcSettleBillPayStatus===>应收:{}",oldBill.getRecMoney());
 
         for(EmisSettlePayRecord item:payRecordList){
-            if("1".equals(item.getRecType())) {
-                totalHasPayMoney = totalHasPayMoney.add(item.getPayMoney());
-                satisfyMoney = satisfyMoney.add(item.getSatisfyMoney() == null ? BigDecimal.ZERO : item.getSatisfyMoney());
-                allowanceMoney = allowanceMoney.add(item.getAllowanceMoney() == null ? BigDecimal.ZERO : item.getAllowanceMoney());
-                deductionMoney = deductionMoney.add(item.getDeductionMoney() == null ? BigDecimal.ZERO : item.getDeductionMoney());
-                otherMoney = otherMoney.add(item.getOtherMoney() == null ? BigDecimal.ZERO : item.getOtherMoney());
-            }
-            else if("2".equals(item.getRecType())) {
+            totalHasPayMoney = totalHasPayMoney.add(item.getPayMoney());
+            satisfyMoney = satisfyMoney.add(item.getSatisfyMoney() == null ? BigDecimal.ZERO : item.getSatisfyMoney());
+            allowanceMoney = allowanceMoney.add(item.getAllowanceMoney() == null ? BigDecimal.ZERO : item.getAllowanceMoney());
+            deductionMoney = deductionMoney.add(item.getDeductionMoney() == null ? BigDecimal.ZERO : item.getDeductionMoney());
+            otherMoney = otherMoney.add(item.getOtherMoney() == null ? BigDecimal.ZERO : item.getOtherMoney());
+
+            if("2".equals(item.getRecType())) {
                 refundMoney = refundMoney.add(item.getRefundMoney() == null ? BigDecimal.ZERO : item.getRefundMoney());
             }
         }
@@ -939,13 +938,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                 // 全部收款金额
                 BigDecimal totalAllPayMoney = BigDecimal.ZERO;
 
-                // 收款金额-退款金额
+                // 收款金额
                 totalAllPayMoney=totalMoney
                         .add(satisfyMoney)
                         .add(allowanceMoney)
                         .add(deductionMoney)
-                        .add(otherMoney)
-                        .subtract(refundMoney);
+                        .add(otherMoney);
 
                 EmisSettleBill newBill = new EmisSettleBill();
                 newBill.setId(oldBill.getId());
@@ -988,8 +986,9 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                         .add(satisfyMoney)
                         .add(allowanceMoney)
                         .add(deductionMoney)
-                        .add(otherMoney)
-                        .subtract(refundMoney);
+                        .add(otherMoney);
+
+//                        .subtract(refundMoney);
 
                 EmisSettleBill newBill = new EmisSettleBill();
                 newBill.setId(oldBill.getId());
@@ -1065,13 +1064,14 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
             // 全部收款金额
             BigDecimal totalAllPayMoney = BigDecimal.ZERO;
             BigDecimal totalMoney = BigDecimal.ZERO;
-            // 收款金额-退款金额
+            // 收款金额
             totalAllPayMoney=totalMoney
                     .add(satisfyMoney)
                     .add(allowanceMoney)
                     .add(deductionMoney)
-                    .add(otherMoney)
-                    .subtract(refundMoney);
+                    .add(otherMoney);
+
+//                    .subtract(refundMoney);
 
             EmisSettleBill newBill = new EmisSettleBill();
             newBill.setId(oldBill.getId());