From 96890ce5ce733e69a60820612a3acd84ccb0acd4 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Tue, 20 Aug 2019 17:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=E7=BA=A2=E5=86=B2=E5=A2=9E=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cache/CollectAuditInfoCache.java          | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index bf5af3a8c..f39b4d319 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -631,8 +631,11 @@ public class CollectAuditInfoCache {
 			.setParameter("COLLECT_STATUS", "手工收款")
 			.setParameter("COLLECT_MSG", "手工扣款")
 			.setParameter("id", bo.getAttribute("id").toString()).executeUpdate();
+			BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", bo.getAttribute("id").toString()).getSingleResult(false);
+			if(boDDI!=null){
+				this.writeBackDistributor(bo.getAttribute("id").toString(), Sqlca);
+			}
 			
-			this.writeBackDistributor(bo.getAttribute("id").toString(), Sqlca);
 			
 		}
 		
@@ -655,11 +658,11 @@ public class CollectAuditInfoCache {
 		BizObjectManager bdi = JBOFactory.getFactory().getManager(DISTRIBUTOR_INFO.CLASS_NAME);
 		
 		for(int c=0;c<ids.length;c++){
-			BizObject bom = bm.createQuery("select distinct O.contract_id,O.plan_list,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id ='"+ids[c]+"'").getSingleResult(false);
-			BizObject boc = bc.createQuery("id=:id").setParameter("id", bom.getAttribute("id").toString()).getSingleResult(false);
-			BigDecimal rent =new BigDecimal(boc.getAttribute("rent").getString());
+			BizObject bom = bm.createQuery("select distinct O.contract_id,O.plan_list,O.plan_date,O.id,O.corpus,O.interest,ca.ACC_NUMBER,ca.ACCOUNT,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id ='"+ids[c]+"'").getSingleResult(false);
+			BigDecimal corpus =new BigDecimal(bom.getAttribute("corpus").getString());
+			BigDecimal interest =new BigDecimal(bom.getAttribute("interest").getString());
 			BigDecimal penalty = new BigDecimal(penaltyArray[c]);
-			String t_rent = rent.add(penalty).toString();
+			String t_rent = corpus.add(interest).add(penalty).toString();
 			//handcraftsingleCollectMoeny方法的最后一个参数原为hire_list，现改为客户输入核销罚息参数（周亚辉）
 			//代偿不再往租金实收表插入数据
 		//	Map<String, String> map = handcraftsingleCollectMoenyDistrbutor(tx,bc,bom,rent,penaltyArray[c]);
@@ -860,7 +863,10 @@ public class CollectAuditInfoCache {
 						.setParameter("COLLECT_MSG", "批量代收,收款成功")
 						.setParameter("BATCH_STATUS", "complete")//更新批量处理状态-完成
 						.setParameter("id", bo.getAttribute("id").toString()).executeUpdate();
-						this.writeBackDistributor(id,Sqlca);
+						BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", id).getSingleResult(false);
+						if(boDDI!=null){
+							this.writeBackDistributor(id,Sqlca);
+						}
 						bo.setAttributeValue("COLLECT_STATUS", "批量收款");
 						bo.setAttributeValue("COLLECT_MSG", "批量代收,收款成功");
 						bo.setAttributeValue("BATCH_STATUS", "complete");
@@ -897,7 +903,10 @@ public class CollectAuditInfoCache {
 							.setParameter("COLLECT_MSG", "批量代收,收款成功")
 							.setParameter("BATCH_STATUS", "complete")//更新批量处理状态-完成
 							.setParameter("id", bo.getAttribute("id").toString()).executeUpdate();
-							this.writeBackDistributor(id,Sqlca);
+							BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", id).getSingleResult(false);
+							if(boDDI!=null){
+								this.writeBackDistributor(id,Sqlca);
+							}
 							bo.setAttributeValue("COLLECT_STATUS", "批量收款");
 							bo.setAttributeValue("COLLECT_MSG", "批量代收,收款成功");
 							bo.setAttributeValue("BATCH_STATUS", "complete");