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

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-07-25 11:40:28 +08:00
commit 69a2a99ec0
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calc/com/tenwa/reckon/bean/ConditionBean.java
View File

@ -161,6 +161,7 @@ public class ConditionBean implements Cloneable{
private String corpusType; // 还本方式
private String corpus; // 期限内本金
private String finalPayment; //尾款
private String finalPaymentMethod; //尾款处置方式
//**********************************************************************【众联车贷测算参与融资资金项结束！】
/***********************************************************************************
@ -1709,4 +1710,10 @@ public class ConditionBean implements Cloneable{
public void setFinalPayment(String finalPayment) {
this.finalPayment = finalPayment;
}
public String getFinalPaymentMethod() {
return finalPaymentMethod;
}
public void setFinalPaymentMethod(String finalPaymentMethod) {
this.finalPaymentMethod = finalPaymentMethod;
}
}

2
calc/com/tenwa/reckon/help/RentalServiceImpl.java
View File

@ -199,7 +199,7 @@ public class RentalServiceImpl {
public List<String> getNormalRentList(ConditionBean cb, List<String> rent_list, String rent) {
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment());
for (int i = 0; i < cb.getIncomeNumber(); i++) {
if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0) {
if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0 && "final_payment_method02".equals(cb.getFinalPaymentMethod())) {
rent_list.add(finalPayment.add(new BigDecimal(rent)).toString());
} else {
rent_list.add(rent);

3
src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
View File

@ -61,7 +61,8 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
+ " values (replace(uuid(),'-',''), '" + this.getProductId() + "', '" + flowBussiness.getAttribute("flow_unid").toString() + "', '" + uuid.replaceAll("-", "") + "',"
+ " " + discountValue + ", '" + this.CurUserID + "', '" + user.getOrgID() + "', replace(now(),'-','/'))"));
} else {
throw new BusinessException("failed@产品贴息额已用完");
this.setError_message("failed@产品贴息额已用完");
throw new BusinessException("产品贴息额已用完");
}
}
}