From 58ce9376cd6b5518fd3734cb43cda57d9ebd0f7b Mon Sep 17 00:00:00 2001
From: 32189 <32189@LAPTOP-3D8E5SVH>
Date: Mon, 26 Apr 2021 11:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ROA=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc/com/tenwa/reckon/help/ConditionHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java
index 4c72373ff..25e6a8c10 100644
--- a/calc/com/tenwa/reckon/help/ConditionHelper.java
+++ b/calc/com/tenwa/reckon/help/ConditionHelper.java
@@ -161,6 +161,7 @@ public class ConditionHelper {
 	    	    BigDecimal costMoney = BigDecimal.ZERO;
 	    	    BigDecimal CostInterestRate = new BigDecimal (productRevenues.get( "CostInterestRate" ).get( "CostInterestRate" ) ).divide( percentage ) ;//产品中的成本利率
 	    	    for (Map<String, String> map : rentPlanData) {
+	    	    	//surplus:当期本金+剩余本金      。   cautionMoney ：保证金
 	    	    	BigDecimal  surplus = new BigDecimal(map.get("corpus") ).add(new BigDecimal(map.get("ALL_REMAIN_CORPUS")));
 	    	    	if(surplus.compareTo(cautionMoney)>0){
 	    	    		costMoney = costMoney.add( surplus.subtract(cautionMoney).multiply( CostInterestRate).divide( new BigDecimal("12"), 2 , 4 ) );
@@ -168,7 +169,7 @@ public class ConditionHelper {
 				}
 	    	    System.out.println(costMoney);
 				// 成本
-				BigDecimal cost = costMoney.subtract( new BigDecimal( cb.getCautionMoney() ).multiply( new BigDecimal( leaseTerm ) ).multiply(CostInterestRate) ).divide( rentRate, 2, 4 );
+				BigDecimal cost = costMoney.divide( rentRate, 2, 4 );
 				// 运营费率
 				String operatingRate = productRevenues.get( "OperatingRate" ).get( "OperatingRate" );
 				// 运营费用