diff --git a/calc/com/tenwa/reckon/bean/ConditionBean.java b/calc/com/tenwa/reckon/bean/ConditionBean.java index fd41bd09f..01dbe2f42 100644 --- a/calc/com/tenwa/reckon/bean/ConditionBean.java +++ b/calc/com/tenwa/reckon/bean/ConditionBean.java @@ -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; + } } diff --git a/calc/com/tenwa/reckon/help/RentalServiceImpl.java b/calc/com/tenwa/reckon/help/RentalServiceImpl.java index e2e4e7bff..168abe415 100644 --- a/calc/com/tenwa/reckon/help/RentalServiceImpl.java +++ b/calc/com/tenwa/reckon/help/RentalServiceImpl.java @@ -199,7 +199,7 @@ public class RentalServiceImpl { public List getNormalRentList(ConditionBean cb, List 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); diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index fa66607d1..a1e3fb657 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -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("产品贴息额已用完"); } } }