From 23983580642d9a736a9b02830cbc46bb4baa49ec Mon Sep 17 00:00:00 2001 From: zzk Date: Wed, 27 Apr 2022 16:07:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8F=90=E5=89=8D=E7=BB=93?= =?UTF-8?q?=E6=B8=85=E7=A7=9F=E9=87=91=E8=AE=A1=E5=88=92=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java index ea6a11c2c..f9a20e7ea 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java @@ -542,7 +542,7 @@ public class EarlyContract { // BigDecimal tax = new BigDecimal( bean.getTax() ).multiply( t ); // BigDecimal other = new BigDecimal( bean.getOther() ).multiply( t ).add( BigDecimal.ONE ); // 获取该合同约定终止日所在月开始所有本金 - String SUM_CORPUS = Sqlca.getString("SELECT ifnull(SUM(ifnull(CORPUS,0)),0) FROM LC_RENT_PLAN WHERE CONTRACT_ID='"+contractId+"' AND date_format(STR_TO_DATE(PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')>=date_format(STR_TO_DATE('"+paydayAdjust+"','%Y/%m/%d'),'%Y/%m/%d')"); + String SUM_CORPUS = Sqlca.getString("SELECT ifnull(SUM(ifnull(CORPUS,0)),0) FROM LC_RENT_PLAN WHERE CONTRACT_ID='"+contractId+"' AND date_format(STR_TO_DATE(PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')>date_format(STR_TO_DATE('"+paydayAdjust+"','%Y/%m/%d'),'%Y/%m/%d')"); // 未结清租金 BigDecimal now_rent = new BigDecimal(0); // 未结清本金 @@ -601,7 +601,7 @@ public class EarlyContract { // end_interest = noIncomeInterest.subtract(noIncomeInterest.multiply(new BigDecimal(equipmentRatio).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP)); // 重新计算末期利息 end_interest = new BigDecimal(incomeInterest).subtract(noIncomeInterest); - interest = end_interest; + interest = planInterest; rent=corpus.add(interest); } }else {