From be26663df1bfa64ba5b82d13be60a31aa661533b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 1 Jul 2022 17:32:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E5=90=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B4=A6=E6=AC=BE=E4=BF=A1=E6=81=AF=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayIncomeContractController.java          | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
index 68fed04a..d9cd8c06 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
@@ -632,6 +632,27 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		if(!CollectionUtils.isEmpty(listAudit)){
 			payIncomeContractDetailOutput.setListAudit(listAudit);
 		}
+		//已收金额
+		BigDecimal amountReceived = payIncomeContractDetailOutput.getAmountReceived();
+		//应收金额
+		BigDecimal accountsReceivableAmount = payIncomeContractDetailOutput.getAccountsReceivableAmount();
+		//相减得到未收金额
+		BigDecimal outstandingAmount = accountsReceivableAmount.subtract(amountReceived);
+		payIncomeContractDetailOutput.setOutstandingAmount(outstandingAmount);
+
+		// 已收全款
+		if(outstandingAmount.compareTo(new BigDecimal("0.00")) == 0
+				|| outstandingAmount.compareTo(new BigDecimal("0.00")) < 0){
+			payIncomeContractDetailOutput.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS3);
+		}
+		// 部分收款
+		if(outstandingAmount.compareTo(new BigDecimal("0.00")) > 0 && outstandingAmount.compareTo(accountsReceivableAmount) < 0){
+			payIncomeContractDetailOutput.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS2);
+		}
+		// 待收款
+		if(outstandingAmount.compareTo(accountsReceivableAmount) == 0 && accountsReceivableAmount.compareTo(new BigDecimal("0.00")) > 0 ){
+			payIncomeContractDetailOutput.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS1);
+		}
 		return Result.OK(payIncomeContractDetailOutput);
 	}