From 4b8b5cb75f3bb6acf07e7151263b52e016abfe42 Mon Sep 17 00:00:00 2001
From: gityjf <2211675158@qq.com>
Date: Fri, 11 Dec 2020 17:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E5=B7=A5=E5=8D=A1?=
 =?UTF-8?q?=E6=89=A3=E9=A1=B5=E9=9D=A2,=E5=90=88=E5=B9=B6=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LcReviewAuditRentPlanByHandleList.jsp     | 40 +++++--------------
 .../cache/CollectAuditInfoCacheTj.java        |  4 +-
 .../rentreback/VILCRentCollectHandler.java    | 11 ++++-
 3 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
index 9fb3d4c6e..9e88721e3 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
@@ -29,25 +29,11 @@
 	//	//{"true","All","Button","实时扣款","实时扣款","timelyCollect()","","","","btn_icon_add",""},
 	//	{"true","All","Button","手工核销","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
 		{"true","All","Button","手动刷新","手动刷新","queryBatchCollect()","","","","btn_icon_add",""},
-		{"true","All","Button","通联刷新","手动刷新","TLquery()","","","","btn_icon_add",""},
 	//	//{"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 
-	window.onload=function(){
-		initFilter();
-	}
-	function initFilter(){
-		
-		filterValues["myiframe0"][TableFactory.getTableColIndexFromDZ("myiframe0",getColIndex(0,"COLLECT_STATUS"))] = "未收款||部分收款"; 
-		setFilterAreaValue(0,"plan_date","<%=plan_date%>");
-		setFilterAreaOption(0,"plan_date","Equals");
-		//submitFilterArea();
-	}
-	
-
-	
 	//批量代收
 	function batchCollect(){
 		//校验所选数据是否是一个主体
@@ -63,14 +49,14 @@
 				}
 			}
 		}
+        var sParm_id = getItemValueArray(0,"id");
+        if(typeof(sParm_id) == "undefined" || sParm_id.length == 0 ){
+            alert("请至少选择一条记录！");
+            return;
+        }
 		if(confirm('确实要执行手动收款操作吗?')){
-			var sParm_id = getItemValueArray(0,"id");
 			var sParm_money = getItemValueArray(0,"collect_money");
-			var sParm_rent = getItemValueArray(0,"rent");
-			if(typeof(sParm_id) == "undefined" || sParm_id.length == 0 ){
-				alert("请至少选择一条记录！");
-				return;
-			}
+			var sParm_rent = getItemValueArray(0,"back_rent");
 			var fileSavePath = "<%=CurConfig.getConfigure("InterfaceFileSavePath")%>";
 			var ids = "";
 			var collect_moneys ="";
@@ -85,7 +71,7 @@
 						return;
 					}
 					if(rent_moneys*100<collect_moneys*100){
-						alert("扣款金额不能大于租金加罚息金额");
+						alert("扣款金额不能大于剩余应还金额");
 						return;
 					}
 					json[sParm_id[0]] = sParm_money[0];
@@ -189,16 +175,12 @@
 			}else{
 				alert("未查询到对应的主体方法！");
 			}
-			
-// 			reloadSelf();
-			location.reload();
+            RunJavaMethod("com.tenwa.lease.app.allinpay.service.impl.AllinpayPaymentDo", "queryCollectResult","");
+ 			reloadSelf();
+//			location.reload();
 		}
 		
 	}
-	function TLquery(){
-		debugger;
-		var resTL = RunJavaMethod("com.tenwa.lease.app.allinpay.service.impl.AllinpayPaymentDo", "queryCollectResult","");
-		console.log(resTL);
-	}
+
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
index a7eec50c5..c915567cc 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
@@ -827,7 +827,6 @@ public class CollectAuditInfoCacheTj {
 			}
 		}
 		BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME);
-		BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME);
 		//这里对天津与深圳的数据进行拆分
 		List<BizObject> bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,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 in ("+parms.toString()+")").getResultList(false);
 		if (bolist.size() != 0) {
@@ -1361,6 +1360,7 @@ public class CollectAuditInfoCacheTj {
         }
 		String req_sn = System.currentTimeMillis()+"";//当日批次号
 		batch_title = merchantNumber+"_"+flag+version+date+"_"+req_sn;
+		//请求报文(限额处理)
 		StringBuffer strbuff = collectBatch(req_sn,list);
 		//响应报文
 		String strResp = cp.CollectAuditPayReq(strbuff,file.getAbsolutePath(), batch_title);
@@ -1584,7 +1584,7 @@ public class CollectAuditInfoCacheTj {
 							.setParameter("id", planId).executeUpdate();
 							transj.commit();
 						}
-						
+
 					}
 					trans.commit();
 					trans_detail.setSN(sn);
diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java
index 36c4a5eeb..b883411a1 100644
--- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java
+++ b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java
@@ -14,11 +14,18 @@ public class VILCRentCollectHandler extends CommonHandler{
 	
 	@Override
 	protected void initDisplayForEdit(BizObject bo) throws Exception {
+
+		double penalty_num = bo.getAttribute("penalty_sum").getDouble();
+		double penalty = bo.getAttribute("penalty").getDouble();
+		double penalty_over =  penalty-penalty_num;
+		penalty_over = new BigDecimal(String.valueOf(penalty_over)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+		bo.setAttributeValue("penalty_over", penalty_over);
+		System.out.println(bo.getAttribute("contract_number").getString()+"    "+String.valueOf(penalty_over));
 		double rent_over = bo.getAttribute("rent_over").getDouble();
-		double penalty_over = bo.getAttribute("penalty_over").getDouble();
 		double back_rent =  rent_over+penalty_over;
 		back_rent = new BigDecimal(String.valueOf(back_rent)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 		bo.setAttributeValue("back_rent", back_rent);
-		
+
+
 	}
 }