anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提前结清部分结清调整

Browse Source
This commit is contained in:
zzk 2022-04-18 16:19:02 +08:00
parent cf3baf66cd
commit 68f8358fb3
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
View File

@ -257,7 +257,7 @@
}
var ret = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","timeInfo","contractId=<%=contractId%>,flowunid=<%=flowunid%>,PAYDAY_ADJUST="+paydayAdjust);
if(ret != "true"){
alert("约定终止日异常,只能提前一个月结清且不能小于当前时间");
alert("日期不能选择当前月份下个月之后的日期");
setItemValue(0,getRow(),"PAYDAY_ADJUST","");
}
}
@ -509,13 +509,14 @@
var dateRate=Number("<%=yearrate%>")/100;//获取利率
var rentPlanDate = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","rentPlanDate","contractId=<%=contractId%>,paydayAdjust="+PAYDAY_ADJUST);
var idays = datedifference(rentPlanDate,PAYDAY_ADJUST);//获取约定终止日和提出日期相差天数
var terminateInfo = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateInfo","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+PAYDAY_ADJUST);
result = result.split("@");
var CORPUS_OVERAGE = result[0];
var PREMATURE_MONEY = result[1];
var RESIDUE_MONEY = result[2];
var DUN_RENT = result[3];
var DUN_PENALTY = result[4];
var DUN_PENALTY = terminateInfo.sumpenalty;
// 未到期本金
setItemValue(0,getRow(),"CORPUS_OVERAGE",CORPUS_OVERAGE);
// 部分结清车辆未到期本金

4
calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
View File

@ -1397,12 +1397,12 @@ public class CreateTransactionExecutor implements Transaction {
Double factMoney = new Double(let.getAttribute("FACT_MONEY").getString());
if(mayopeMoney>=advanceMoney){
Double mayopeMoneyNew = mayopeMoney-advanceMoney;
let.setAttributeValue("HAD_MONEY", factMoney - mayopeMoneyNew);
let.setAttributeValue("HAD_MONEY", advanceMoney);
let.setAttributeValue("MAYOPE_MONEY", mayopeMoneyNew);
letManage.saveObject(let);
break;
}else{
let.setAttributeValue("HAD_MONEY", factMoney);
let.setAttributeValue("HAD_MONEY", mayopeMoney);
advanceMoney = advanceMoney-mayopeMoney;
let.setAttributeValue("MAYOPE_MONEY", 0);
letManage.saveObject(let);

11
src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java
View File

@ -226,9 +226,7 @@ public class EarlyContract {
String lastMonth2 = mon.format(b.getTime());
date5 = mon.parse(lastMonth2);
if(date2.before(date3)) {
ret = "false";
}else if(date4.before(date5)) {
if(date4.before(date5)) {
ret = "false";
}
@ -417,11 +415,8 @@ public class EarlyContract {
if(DUN_RENT == null) {
DUN_RENT="0.00";
}
// 逾期罚息- 本次结清车辆截止约定终止日所有罚息
String DUN_PENALTY =Sqlca.getString("select ifnull(SUM(ROUND(ifnull(GETRENTPENALTY (LRP.PAYMENT_NUMBER, LRP.PLAN_LIST, '\"+PAYDAY_ADJUST+\"')-ifnull(LRI.PENALTY, 0)-ifnull(LRI.PENALTY_ADJUST, 0), 0), 2)),0) as DUN_PENALTY from LC_RENT_PLAN LRP left join (select PAYMENT_NUMBER,PLAN_LIST,SUM(ifnull(PENALTY, 0)) as PENALTY,SUM(ifnull(PENALTY_ADJUST, 0)) as PENALTY_ADJUST from LC_RENT_INCOME group by PAYMENT_NUMBER,PLAN_LIST) LRI on LRI.PAYMENT_NUMBER = LRP.PAYMENT_NUMBER and LRI.PLAN_LIST = LRP.PLAN_LIST where date_format(STR_TO_DATE(lrp.PLAN_DATE, '%Y/%m/%d'), '%Y/%m')> date_format(STR_TO_DATE('\"+PAYDAY_ADJUST+\"', '%Y/%m/%d'), '%Y/%m') and LRP.CONTRACT_ID = '"+contractId+"'");
// return CORPUS_OVERAGE+"@"+PREMATURE_MONEY+"@"+RESIDUE_MONEY+"@"+DUN_RENT+"@"+DUN_PENALTY;
return ""+CORPUS_OVERAGE+"@"+PREMATURE_MONEY+"@"+RESIDUE_MONEY+"@"+DUN_RENT+"@"+DUN_PENALTY+"";
// return CORPUS_OVERAGE+"@"+PREMATURE_MONEY+"@"+RESIDUE_MONEY+"@"+DUN_RENT+";
return ""+CORPUS_OVERAGE+"@"+PREMATURE_MONEY+"@"+RESIDUE_MONEY+"@"+DUN_RENT+"";
}catch(Exception e){
e.printStackTrace();
return "ERR";