From 456ef5a63c4b72b9da6f1ba18599077dc24c3258 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Fri, 13 Dec 2019 18:33:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=89=8B=E7=BB=AD=E8=B4=B9?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=94=AF=E4=BB=98=E7=9A=84=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/Rent/RentReback/SplittingList.jsp    |  2 +-
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml       |  7 +-
 .../flow/rent/rentreback/OtherPayMethod.java  | 93 +++++++++++--------
 3 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp
index 51a349572..e8c10a189 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/SplittingList.jsp
@@ -38,7 +38,7 @@
 		}
 		
 		var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.rent.rentreback.OtherPayMethod","createSplittingPayTemp",
-				"planIDs="+id+",interestSPs="+interestSP+",flowunid=<%=flowunid%>,serviceType=AutoBuckle");
+				"planIDs="+id+",interestSPs="+interestSP+",flowunid=<%=flowunid%>");
 		if("success"==sResult){
 			alert("操作成功,请到分润支付数据中查看！");
 			reloadSelf();
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 177c769bd..c3cb359dd 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -245,6 +245,7 @@
 				<attribute name="UPDATEORGID" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
 				<attribute name="RETURN_MONEY" label="閫�鍥為噾棰�" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="BUSINESS_TYPE" label="涓氬姟绫诲瀷" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -530,6 +531,7 @@
 				<attribute name="CORPUS_SP" label="鍒嗘鼎鎴愭湰" type="String" length="18" scale="2"/>
 				<attribute name="INTEREST_sp" label="鍒嗘鼎缁橲P" type="String" length="18" scale="2"/>
 				<attribute name="SPLITTING_STATUS" label="鍒嗘鼎鏀粯鐘舵��" type="STRING" length="2"/>
+				<attribute name="CHARGE_WAY" label="鎵嬬画璐硅垂鐜囩被鍨�" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1515,6 +1517,7 @@
 				<attribute name="CORPUS_SP" label="鍒嗘鼎鎴愭湰" type="String" length="18" scale="2"/>
 				<attribute name="INTEREST_sp" label="鍒嗘鼎缁橲P" type="String" length="18" scale="2"/>
 				<attribute name="SPLITTING_STATUS" label="鍒嗘鼎鏀粯鐘舵��" type="STRING" length="2"/>
+				<attribute name="CHARGE_WAY" label="鎵嬬画璐硅垂鐜囩被鍨�" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2491,6 +2494,7 @@
 				<attribute name="CORPUS_SP" label="鍒嗘鼎鎴愭湰" type="String" length="18" scale="2"/>
 				<attribute name="INTEREST_sp" label="鍒嗘鼎缁橲P" type="String" length="18" scale="2"/>
 				<attribute name="SPLITTING_STATUS" label="鍒嗘鼎鏀粯鐘舵��" type="STRING" length="2"/>
+				<attribute name="CHARGE_WAY" label="鎵嬬画璐硅垂鐜囩被鍨�" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -4104,7 +4108,8 @@
 				<attribute name="interest" label="interest" type="STRING"/>
 				<attribute name="corpus_sp" label="corpus_sp" type="STRING"/>
 				<attribute name="INTEREST_sp" label="INTEREST_sp" type="STRING"/>
-				<attribute name="splitting_status" label="splitting_status" type="STRING"/>
+				<attribute name="splitting_status" label="splitting_status" type="STRING"/>
+				<attribute name="CHARGE_WAY" label="鎵嬬画璐硅垂鐜囩被鍨�" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java
index cf6caefec..3a0fa88fa 100644
--- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java
+++ b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java
@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import jbo.app.tenwa.calc.LC_EBANK_PROCESS;
+import jbo.app.tenwa.calc.LC_RENT_PLAN;
 import jbo.app.tenwa.customer.LPOUNDAGE_MAINTENANCE;
 import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY_TEMP;
 
@@ -36,48 +37,45 @@ public class OtherPayMethod {
 	
 	
 
-	public String createSplittingPayTemp(JBOTransaction tx){
-		SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd");
-		String currentDate = df.format(new Date());
-		BizObjectManager lm;
+	public String createSplittingPayTemp(JBOTransaction tx) throws JBOException{
 		BigDecimal ratio = null;
 		String rate = "0";
-		try {
-			lm = JBOFactory.getBizObjectManager(LPOUNDAGE_MAINTENANCE.CLASS_NAME,tx);
-			String getServiceRatioSQL = "select rate from O where charge_way='"+serviceType+"' AND start_date<='"+currentDate+"' AND expiry_date>='"+currentDate+"'";
-			BizObject boRatio = lm.createQuery(getServiceRatioSQL).getSingleResult(false);
-			rate = boRatio.getAttribute("rate").toString();
-			ratio = (new BigDecimal(rate)).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP);
-		} catch (JBOException e1) {
-			e1.printStackTrace();
-			return "获取手续费费率失败";
-		}
-		if(ratio!=null){
-			String[] interestSP = interestSPs.split("@");
-			String[] planID = planIDs.split("@");
-			if(interestSP.length==planID.length){
-				for(int i=0;i<planID.length;i++){
-					String serviceMoney = (new BigDecimal(interestSP[i])).multiply(ratio).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
-					String splitting_money = (new BigDecimal(interestSP[i])).subtract(new BigDecimal(serviceMoney)).toString();
-					String plan_id = planID[i];
-					try {
-						BizObjectManager bomLspt = JBOFactory.getBizObjectManager(LC_SPLITTING_PAY_TEMP.CLASS_NAME,tx);
-						BizObject bolspt = bomLspt.newObject();
-						bolspt.setAttributeValue("plan_id", plan_id);
-						bolspt.setAttributeValue("splitting_money", splitting_money);
-						bolspt.setAttributeValue("service_ratio", rate);
-						bolspt.setAttributeValue("service_money", serviceMoney);
-						bolspt.setAttributeValue("flowunid", flowunid);
-						bolspt.setAttributeValue("inputtime", StringFunction.getTodayNow());
-						bomLspt.saveObject(bolspt);
-						changeSplittingStatus(tx,plan_id,"0");
-					} catch (JBOException e) {
-						e.printStackTrace();
-						return "插入临时表失败";
-					}
-				}
+		String[] planID = planIDs.split("@");
+		
+		for(int i=0;i<planID.length;i++){
+			BizObject boLRP = JBOFactory.createBizObjectQuery(LC_RENT_PLAN.CLASS_NAME, "ID=:ID").setParameter("ID", planID[i]).getSingleResult(false);
+			String interest_sp = boLRP.getAttribute("INTEREST_sp")==null?"0":boLRP.getAttribute("INTEREST_sp").toString();
+			String chargeWay = boLRP.getAttribute("CHARGE_WAY")==null?"0":boLRP.getAttribute("CHARGE_WAY").toString();
+			String serviceMoney = "0";
+			String splitting_money = interest_sp;
+			ratio = getRatio(tx,chargeWay);
+			if(ratio==null){
+				return "获取手续费费率失败。";
+			}
+			if(ratio.compareTo(new BigDecimal("0"))!=0){
+				serviceMoney = (new BigDecimal(interest_sp)).multiply(ratio).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
+				splitting_money = (new BigDecimal(interest_sp)).subtract(new BigDecimal(serviceMoney)).toString();
+			}
+			
+			String plan_id = planID[i];
+			try {
+				BizObjectManager bomLspt = JBOFactory.getBizObjectManager(LC_SPLITTING_PAY_TEMP.CLASS_NAME,tx);
+				BizObject bolspt = bomLspt.newObject();
+				bolspt.setAttributeValue("plan_id", plan_id);
+				bolspt.setAttributeValue("splitting_money", splitting_money);
+				bolspt.setAttributeValue("service_ratio", rate);
+				bolspt.setAttributeValue("service_money", serviceMoney);
+				bolspt.setAttributeValue("flowunid", flowunid);
+				bolspt.setAttributeValue("inputtime", StringFunction.getTodayNow());
+				bomLspt.saveObject(bolspt);
+				changeSplittingStatus(tx,plan_id,"0");
+			} catch (Exception e) {
+				e.printStackTrace();
+				return "插入临时表失败";
 			}
 		}
+		
+		
 		return "success";
 	}
 	/**
@@ -119,7 +117,7 @@ public class OtherPayMethod {
 		
 			LeaseFlowBaseService service=new LeaseFlowBaseServiceImp();
 			try {
-				BizObjectManager bom = JBOFactory.getBizObjectManager(LC_EBANK_PROCESS.CLASS_NAME);
+				BizObjectManager bom = JBOFactory.getBizObjectManager(LC_EBANK_PROCESS.CLASS_NAME,tx);
 				tx.join(bom);
 				BizObject bo = bom.newObject();
 				bo.setAttributeValue("EBANK_NUMBER", idArray[i]);
@@ -159,6 +157,23 @@ public class OtherPayMethod {
 		}
 		return "success";
 	}
+	public BigDecimal getRatio(JBOTransaction tx,String serviceType){
+		SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd");
+		String currentDate = df.format(new Date());
+		BizObjectManager lm;
+		BigDecimal ratio = null;
+		try {
+			lm = JBOFactory.getBizObjectManager(LPOUNDAGE_MAINTENANCE.CLASS_NAME,tx);
+			String getServiceRatioSQL = "select rate from O where charge_way='"+serviceType+"' AND start_date<='"+currentDate+"' AND expiry_date>='"+currentDate+"'";
+			BizObject boRatio = lm.createQuery(getServiceRatioSQL).getSingleResult(false);
+			String rate = boRatio.getAttribute("rate")==null?"0":boRatio.getAttribute("rate").toString();
+			ratio = (new BigDecimal(rate)).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+		return ratio;
+	}
 	public String getFlowunid() {
 		return flowunid;
 	}