From 84932ccc39a3bce39c128333bc6f1b039a650979 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 11 Mar 2020 08:53:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BD=91=E9=93=B6=E6=94=B6=E6=AC=BE=E5=90=8E?=
 =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=9D=E8=AF=81=E9=87=91=E4=BB=A3?=
 =?UTF-8?q?=E5=81=BF=E7=BA=A2=E5=86=B2=E5=87=BA=E7=8E=B0=E4=B8=A4=E6=AC=A1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/rent/copyrent/InsertRentPlanStatus.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java
index 53fe0b8ad..313b8574c 100644
--- a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java
+++ b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java
@@ -1,6 +1,8 @@
 package com.tenwa.flow.rent.copyrent;
+import java.math.BigDecimal;
 import java.util.List;
 
+import jbo.app.tenwa.calc.LC_RENT_INCOME;
 import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP;
 import jbo.app.tenwa.calc.LC_RENT_PLAN;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
@@ -20,7 +22,7 @@ public class InsertRentPlanStatus extends BaseBussiness{
 		
 		List<BizObject> boLRITs=JBOFactory.createBizObjectQuery(LC_RENT_INCOME_TEMP.CLASS_NAME,"flowunid=:flowunid").setParameter("flowunid", flowunid).getResultList(false);
 		BizObjectManager bomLRP = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME, Sqlca.getTransaction());
-		
+
 		CollectAuditInfoCache calc = new CollectAuditInfoCache();
 		for(int i=0;i<boLRITs.size();i++){
 			BizObject boLRIT = boLRITs.get(i);
@@ -30,7 +32,12 @@ public class InsertRentPlanStatus extends BaseBussiness{
 			bomLRP.createQuery("update O set COLLECT_STATUS='网银收款',COLLECT_MSG='网银收款' where CONTRACT_ID=:CONTRACT_ID and PLAN_LIST=:PLAN_LIST")
 			.setParameter("CONTRACT_ID", contractId).setParameter("PLAN_LIST", planList).executeUpdate();
 			BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", rentPlanId).getSingleResult(false);
-			if(boDDI!=null){
+			String sSql = "SELECT IFNULL(SUM(IFNULL(O.rent,0)),0) + IFNULL(SUM(IFNULL(O.penalty,0)),0) - IFNULL(SUM(IFNULL(O.corpus_adjust,0)),0) - IFNULL(SUM(IFNULL(O.interest_adjust,0)),0) - IFNULL(SUM(IFNULL(O.penalty_adjust,0)),0) - lrp.rent - getRentPenalty(lrp.payment_number,lrp.plan_list,DATE_FORMAT(SYSDATE(),'%Y/%m/%d')) AS flag FROM lc_rent_income O LEFT JOIN LC_RENT_PLAN lrp ON O.plan_id=lrp.id  WHERE O.PLAN_ID='"+rentPlanId+"'";
+			String money = Sqlca.getString(sSql);
+			BigDecimal balance_money = new BigDecimal(money).setScale(2, BigDecimal.ROUND_HALF_UP);
+			System.out.println("===========租金差额为：     "+money);
+			//有代偿记录，并且本次租金已经还完
+			if(boDDI!=null&&balance_money.compareTo(new BigDecimal("0"))>-1){
 				calc.writeBackDistributor(rentPlanId, Sqlca);
 			}
 		}