LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 合同查询详情账款信息错误

Browse Source
This commit is contained in:
lijiarao
2022-07-01 17:32:47 +08:00
parent aaa08dcbc6
commit be26663df1
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+21
View File
@@ -632,6 +632,27 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
if(!CollectionUtils.isEmpty(listAudit)){ if(!CollectionUtils.isEmpty(listAudit)){
payIncomeContractDetailOutput.setListAudit(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); return Result.OK(payIncomeContractDetailOutput);
} }