From 6bfa2b704f3b9f6c820decc1a4d5f78a121f6f37 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Fri, 27 Aug 2021 16:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E4=BF=A1=E6=81=AF=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml                 | 1 +
 WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp | 9 ++++-----
 WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp | 5 +++--
 src/com/ap/BuyBack.java                                | 3 +++
 src_jbo/jbo/oti/FC_BUYBACK_INFO.java                   | 4 ++++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index fe917c2b1..572077ce2 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -517,6 +517,7 @@
 				<attribute name="SECOND_OVERDUE_INTEREST"    label="逾期第二期利息"    type="STRING" length="32"/>
 				<attribute name="SECOND_OVERDUE_PENALTY"    label="逾期第二期罚息"    type="STRING" length="32"/>
 				<attribute name="BUYBACK_MONEY"    label="实际回购总金额"    type="STRING" length="32"/>
+				<attribute name="ALL_REMAIN_MONEY"    label="回购金额（本金+利息），不包含罚息"    type="STRING" length="32"/>
 				<attribute name="VOUCHER_STATUS"    label="凭证状态：0，未生成，1，已生成"    type="STRING" length="32"/>
 				<attribute name="INPUTUSERID" label="登记人" type="STRING" length="32"/>
 				<attribute name="INPUTTIME" label="登记时间" type="STRING" length="32"/>
diff --git a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp
index 0a9e5219d..7f87508e2 100644
--- a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp
+++ b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp
@@ -9,6 +9,7 @@
 	String secondOverdueInterest = CurPage.getParameter("secondOverdueInterest");
 	String overdueList = CurPage.getParameter("overdueList");
 	String voucherStatus = CurPage.getParameter("voucherStatus");
+	String allRemainMoney = CurPage.getParameter("allRemainMoney");
 	String readOnly = "0";
 	if("1".equals(voucherStatus)){
 		readOnly="1";
@@ -35,20 +36,18 @@
 			setItemValue(0,0,"SECOND_OVERDUE_CORPUS","<%=secondOverdueCorpus%>");
 			setItemValue(0,0,"SECOND_OVERDUE_INTEREST","<%=secondOverdueInterest%>");
 			setItemValue(0,0,"OVERDUE_LIST","<%=overdueList%>");
+			setItemValue(0,0,"ALL_REMAIN_MONEY","<%=allRemainMoney%>");
 		}
 	}
 	function returnList(){
 		AsControl.OpenComp("com/tenwa/apzl/settleLoan/FcBuyBackList.jsp","","_self","");
 	}
 	function save(){
-		var firstOverdueCorpus = getItemValue(0,0,"FIRST_OVERDUE_CORPUS");
-		var firstOverdueInterest = getItemValue(0,0,"FIRST_OVERDUE_INTEREST");
-		var secondOverdueCorpus = getItemValue(0,0,"SECOND_OVERDUE_CORPUS");
-		var secondOverdueInterest = getItemValue(0,0,"SECOND_OVERDUE_INTEREST");
+		var allRemainMoney = getItemValue(0,0,"ALL_REMAIN_MONEY");
 		var firstOverduePenalty = getItemValue(0,0,"FIRST_OVERDUE_PENALTY");
 		var secondOverduePenalty = getItemValue(0,0,"SECOND_OVERDUE_PENALTY");
 		var buybackMoney = getItemValue(0,0,"BUYBACK_MONEY");
-		var buybackMoneySum = eval(firstOverdueCorpus +"+"+ firstOverdueInterest +"+"+ secondOverdueCorpus +"+"+ secondOverdueInterest +"+"+ firstOverduePenalty +"+"+ secondOverduePenalty) ;
+		var buybackMoneySum = eval( allRemainMoney +"+"+ firstOverduePenalty +"+"+ secondOverduePenalty) ;
 		if(buybackMoney!=buybackMoneySum.toFixed(2)){
 			alert("本金利息罚息金额相加总额"+buybackMoneySum+"与所填‘回购总金额’不相等");
 			return;
diff --git a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp
index 40d1491d8..1edbfd0f3 100644
--- a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp
+++ b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp
@@ -16,7 +16,7 @@
 	String sButtons[][] = {
 		{"true","","Button","新增","新增","newRecord()","","","","btn_icon_detail",""},
 		{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","删除","删除","do_delete()","","","","btn_icon_delete",""},
+		{"true","","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -42,7 +42,8 @@
 			var secondOverdueCorpus = result.SECOND_OVERDUE_CORPUS;
 			var secondOverdueInterest = result.SECOND_OVERDUE_INTEREST;
 			var overdueList = result.OVERDUE_LIST;
-			var param = 'fcRequestId='+fcRequestId+'&firstOverdueCorpus='+firstOverdueCorpus+'&firstOverdueInterest='+firstOverdueInterest+'&secondOverdueCorpus='+secondOverdueCorpus+'&secondOverdueInterest='+secondOverdueInterest+'&overdueList='+overdueList;
+			var allRemainMoney = result.ALL_REMAIN_MONEY;
+			var param = 'fcRequestId='+fcRequestId+'&firstOverdueCorpus='+firstOverdueCorpus+'&firstOverdueInterest='+firstOverdueInterest+'&secondOverdueCorpus='+secondOverdueCorpus+'&secondOverdueInterest='+secondOverdueInterest+'&overdueList='+overdueList+'&allRemainMoney='+allRemainMoney;
 			var sUrl = "com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp";
 			AsControl.OpenView(sUrl,param,'_self','');
 
diff --git a/src/com/ap/BuyBack.java b/src/com/ap/BuyBack.java
index 4a4e9583d..ed9386e6d 100644
--- a/src/com/ap/BuyBack.java
+++ b/src/com/ap/BuyBack.java
@@ -40,6 +40,7 @@ public class BuyBack {
         BizObjectQuery boqLRP = bomLRP.createQuery("contract_id=:contractId and plan_list=:planList").setParameter("contractId",contractId);
         BizObject boLRP = boqLRP.setParameter("planList",planList).getSingleResult(false);
         String rent_plan =  boLRP.getAttribute("rent").getString();
+        String allRemainCorpus = boLRP.getAttribute("ALL_REMAIN_CORPUS").getString();
         //检验当期是否结清
         boolean planListIsComplete = new BigDecimal(rent_in).compareTo(new BigDecimal(rent_plan))>=0;
 
@@ -66,6 +67,7 @@ public class BuyBack {
             jsonObject.put("SECOND_OVERDUE_CORPUS",corpus2);
             jsonObject.put("SECOND_OVERDUE_INTEREST",interest2);
             jsonObject.put("OVERDUE_LIST",planList+1);
+            jsonObject.put("ALL_REMAIN_MONEY",new BigDecimal(allRemainCorpus).add(new BigDecimal(interest1)).add(new BigDecimal(interest2)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
         }else{
             String buyBackCorpus = new BigDecimal(boLRP.getAttribute("corpus").toString()).subtract(new BigDecimal(corpus)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
             String buyBackInterest = new BigDecimal(boLRP.getAttribute("interest").toString()).subtract(new BigDecimal(interest)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
@@ -74,6 +76,7 @@ public class BuyBack {
             jsonObject.put("SECOND_OVERDUE_CORPUS",corpus1);
             jsonObject.put("SECOND_OVERDUE_INTEREST",interest1);
             jsonObject.put("OVERDUE_LIST",planList);
+            jsonObject.put("ALL_REMAIN_MONEY", new BigDecimal(allRemainCorpus).subtract(new BigDecimal(corpus)).add(new BigDecimal(buyBackInterest)).add(new BigDecimal(interest1)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
         }
         return jsonObject.toString();
     }
diff --git a/src_jbo/jbo/oti/FC_BUYBACK_INFO.java b/src_jbo/jbo/oti/FC_BUYBACK_INFO.java
index 48425d369..135c44a68 100644
--- a/src_jbo/jbo/oti/FC_BUYBACK_INFO.java
+++ b/src_jbo/jbo/oti/FC_BUYBACK_INFO.java
@@ -51,6 +51,10 @@ public interface FC_BUYBACK_INFO {
 	 * 实际回购总金额 STRING(32)<br>
 	 */
 	public static final String BUYBACK_MONEY = "BUYBACK_MONEY";
+	/**
+	 * 回购金额（本金+利息），不包含罚息 STRING(32)<br>
+	 */
+	public static final String ALL_REMAIN_MONEY = "ALL_REMAIN_MONEY";
 	/**
 	 * 凭证状态：0，未生成，1，已生成 STRING(32)<br>
 	 */