From dc466405d8c72f4b65f9f8e7a7d99beab8bf6334 Mon Sep 17 00:00:00 2001 From: zhulh Date: Thu, 19 Aug 2021 11:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=89=E9=B9=8F=E4=BF=9D?= =?UTF-8?q?=E8=AF=81=E9=87=91=E6=8A=B5=E6=89=A3=E4=B8=BA=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E6=8A=B5=E6=89=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/FundFundPlanExecutor.java | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index b3301fadd..e93d27bc3 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -446,12 +446,13 @@ public class FundFundPlanExecutor { List planDates = planBean.getPlanDateList(); List rentPlans = planBean.getRentList(); //安鹏逻辑，只抵最后一期租金 - BigDecimal lastRent = new BigDecimal(rentPlans.get(rentPlans.size() - 1)); - BigDecimal cautionMoneyDeduction = new BigDecimal(cb.getCautionDeductionMoney()); - if(lastRent.compareTo(cautionMoneyDeduction) < 0) { - cb.setCautionMoneyRemain(cautionMoneyDeduction.subtract(lastRent).toString()); - cb.setCautionDeductionMoney(lastRent.toString()); - } + // 取消安鹏只抵最后一期逻辑 by zhulh 2021/08/19 +// BigDecimal lastRent = new BigDecimal(rentPlans.get(rentPlans.size() - 1)); +// BigDecimal cautionMoneyDeduction = new BigDecimal(cb.getCautionDeductionMoney()); +// if(lastRent.compareTo(cautionMoneyDeduction) < 0) { +// cb.setCautionMoneyRemain(cautionMoneyDeduction.subtract(lastRent).toString()); +// cb.setCautionDeductionMoney(lastRent.toString()); +// } List newFundPlans = new ArrayList(); if(Double.parseDouble(cb.getCautionMoneyRemain()) > 0){//退还保证金 FundPlanBean newFundPlan=new FundPlanBean(); @@ -467,16 +468,7 @@ public class FundFundPlanExecutor { } if(Double.parseDouble(cb.getCautionDeductionMoney()) > 0){//抵扣保证金 BigDecimal planMoney=new BigDecimal(cb.getCautionDeductionMoney()); - FundPlanBean newFundPlan=new FundPlanBean(); - newFundPlan.setFeeType(reduceType); - newFundPlan.setPlanList("1"); - newFundPlan.setSettleMethod("payfund6"); - newFundPlan.setPayType("pay_type_out"); - newFundPlan.setPlanMoney(planMoney.toString()); - newFundPlan.setPlanDate(planDates.get(planDates.size() - 1)); - newFundPlan.setPayCust(custID); - newFundPlans.add(newFundPlan); - /*int planList=0; + int planList=0; for(int i = planDates.size()-1 ; i >= 0 ; i--){ planList++; BigDecimal rent=new BigDecimal(rentPlans.get(i)); @@ -511,7 +503,7 @@ public class FundFundPlanExecutor { cb.setDeductionLastPlanDate(planDates.get(i)); break; } - }*/ + } }else{ cb.setDeductionLastPlanDate(cb.getLastPlanDate()); }