From 2f8a76fae8de06ed2e4e65e9ddd35a068ad5666d Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 20 Mar 2023 17:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 2754c9952d..daf0f8c79a 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -241,7 +241,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             //是否有余额
             if (StringUtils.isNotBlank(record.getBalance())) {
                 //余额是0
-                if (new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0) {
+                if (new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) <= 0) {
                     record.setShowHandle(false);
                 } else {
                     //是否是待审核状态或已驳回状态
@@ -721,7 +721,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BigDecimal balance = record.getBalance();//余额
             //审核状态：1待审核/2已驳回/3已审核
             if (balance != null) {
-                if (balance.compareTo(BigDecimal.ZERO) == 0) {
+                if (balance.compareTo(BigDecimal.ZERO) <= 0) {
                     record.setShowHandle(false);
                     record.setShowDelete(false);
                 } else {
@@ -1869,7 +1869,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //查询该申请所有的款项明细
         finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
         //与收款金额作比较：更新认款状态  1未认款/2部分认款/3已认款
-        confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) == 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
+        confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) <= 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
         //更新收款申请的余额以及审核状态
         BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
         confirmation.setBalance(balanceBigDecimal);