From f630e74224c3b067d145dcf4c504e08d4ad2cfa0 Mon Sep 17 00:00:00 2001
From: zhangjun <zhangjun@DESKTOP-BF9USEF>
Date: Thu, 7 Nov 2019 16:51:31 +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=E4=BB=A3=E5=81=BF=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1?=
 =?UTF-8?q?=E3=80=81=E5=90=8C=E6=AD=A5=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectaudit/cache/CollectAuditInfoCache.java     | 11 +++++------
 .../quartzmession/DistributorMarginCompensation.java  |  8 +++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index a79fa772c..fa5963338 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -111,7 +111,7 @@ public class CollectAuditInfoCache {
 				parms.append(",'"+str+"'");
 			}
 		}
-		BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME);
+		BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME,tx);
 		List<BizObject> bolist = bm.createQuery("select v.getCustomerName(O.customer_id) as v.customer_name,O.account,O.acc_number,O.mobile,O.contract_id,O.plan_list,O.plan_date,O.COLLECT_STATUS,O.BATCH_STATUS,O.rent from O where O.id in ("+parms.toString()+")").getResultList(false);
 		for (BizObject bo : bolist) {
 			String name = bo.getAttribute("customer_name").toString().trim();
@@ -652,10 +652,10 @@ public class CollectAuditInfoCache {
 		String[] ids = id.split("@");
 		String[] penaltyArray = penaltys.split("@");
 		
-		BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME);
-		BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME);
-		BizObjectManager bd = JBOFactory.getFactory().getManager(D_DEPOSITRETURN_INFO.CLASS_NAME);
-		BizObjectManager bdi = JBOFactory.getFactory().getManager(DISTRIBUTOR_INFO.CLASS_NAME);
+		BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME,tx);
+		BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,tx);
+		BizObjectManager bd = JBOFactory.getFactory().getManager(D_DEPOSITRETURN_INFO.CLASS_NAME,tx);
+		BizObjectManager bdi = JBOFactory.getFactory().getManager(DISTRIBUTOR_INFO.CLASS_NAME,tx);
 		
 		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,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);
@@ -692,7 +692,6 @@ public class CollectAuditInfoCache {
 			//修改经销商信息表里的金额
 			bdi.createQuery("update O set O.sums='"+account_balance+"' where O.distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).executeUpdate();
 		}
-		
 		return "总共有 "+i+" 笔租金收款成功\n"+j+" 笔租金收款失败";
 	}
 	private BigDecimal BigDecimal(String string) {
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java b/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java
index 94d7395e4..e95786984 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java
@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 
 import jbo.com.tenwa.lease.carbrand.lb_automatic_compensatory;
 import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN;
@@ -21,10 +22,14 @@ import com.tenwa.comm.util.date.DateAssistant;
 import com.tenwa.flow.action.comm.SelectBalance;
 
 public class DistributorMarginCompensation  implements Job {
+	
 	private JobInitUserName jboName;
 	
+	public static ReentrantLock lock = new ReentrantLock();
+	
 	@Override
-	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+	public  void execute(JobExecutionContext arg0) throws JobExecutionException {
+		lock.lock();
 		JBOTransaction tx =null;
 		Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId");
 		String curUserId = userId == null? "system" : userId.toString();
@@ -115,6 +120,7 @@ public class DistributorMarginCompensation  implements Job {
 				}
 			}
 		}finally{
+			lock.unlock();
 			try {
 				if(tx !=null){