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

灵活产品测算时，可以0利率，租金等于本金(当测算年利率和测算租金全部为0时，按0利率，当利率有值时则按利率算租金，当租金有值且利率=0时，则按租金算利率)

Browse Source
This commit is contained in:
zhangbeibei 2021-03-26 10:50:10 +08:00
parent 9f5a98140f
commit c272a6c48f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -1157,13 +1157,14 @@ function saveRecord(sPostEvents){
if ( 'Y' === '<%=flexible%>' ) {
var yearRate = getItemValue( 0, 0, 'YEAR_RATE' );
var rentValue = getItemValue( 0, 0, 'RENT_VALUE' );
if ( Number( yearRate ) === 0 && Number( rentValue ) === 0 ) {
alert( '灵活产品下，请在测算年利率或预计租金中填值' );
if(yearRate>0 || ( Number( yearRate ) === 0 && Number( rentValue ) === 0 )){
setItemValue( 0, 0, 'RENT_OR_RATE', 'rate' );
}else if(rentValue>0 && Number( yearRate ) === 0 ){
setItemValue( 0, 0, 'RENT_OR_RATE', 'rent' );
}else{
alert( '灵活产品下，测算年利率或预计租金不能为空或者小于0' );
return;
} else if ( Number( yearRate ) === 0 ) {
setItemValue( 0, 0, 'RENT_OR_RATE', 'rent' );
} else {
setItemValue( 0, 0, 'RENT_OR_RATE', 'rate' );
}
var cautionMoneyRatio = getItemValue( 0, 0, 'CAUTION_MONEY_RATIO' );
var firstPaymentRatio = getItemValue( 0, 0, 'FIRST_PAYMENT_RATIO' );

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

@ -92,7 +92,7 @@ public class CreateTransactionExecutor implements Transaction {
String yearRate = bean.getCb().getYearRate();
this.preHandle(bean.getCb(),bean);
checkYearRate( bean.getCb(), bean, new BigDecimal( bean.getCb().getYearRate() ) );//当初理解错误，成本利率和年利率不一样
if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<=0){
if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<0){
throw new BusinessException("按租金算年利率租金总和不能小于融资额");
}
bean.setProductType(productType);