diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index c1f2902e..b159cfa6 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1513,12 +1513,14 @@ public class ClientUtils { interestrate = BigDecimalUtils.div(interestrate, new BigDecimal("100"), 10); BigDecimal calculate = BigDecimal.ZERO; BigDecimal interestdays = BigDecimal.ZERO; + BigDecimal yem_sinosurerate = BigDecimal.ZERO; int rowCount = model.getEntryRowCount("yem_es_salescontrac_s"); for (int i = 0; i < rowCount; i++) { String issinosure = (String) model.getValue("yem_issinosure", i); if ("A".equals(issinosure)) { BigDecimal raprate = (BigDecimal) model.getValue("yem_raprate", i);//收汇百分比% interestdays = interestdays.add((BigDecimal) model.getValue("yem_interestdays", i));//利息天数 + yem_sinosurerate = yem_sinosurerate.add((BigDecimal) model.getValue("yem_sinosurerate", i));//利息天数 // raprate = BigDecimalUtils.div(raprate, new BigDecimal("100"), 10); // BigDecimal multiply = BigDecimalUtils.div(safobprice.add(seafreight).add(marinsupreamt).multiply(raprate).multiply(interestrate), new BigDecimal("360"), 10).multiply(interestdays); calculate = calculate.add(raprate); @@ -1533,7 +1535,12 @@ public class ClientUtils { multiply = BigDecimalUtils.div(multiply, 100, 10); multiply = BigDecimalUtils.div(multiply, 360, 10); // BigDecimalUtils.div(yem_e_interestamt, new BigDecimal("100"), 10); - model.setValue("yem_e_interestamt", multiply.setScale(0, RoundingMode.UP), rowIdx); + BigDecimal setScale = multiply.setScale(0, RoundingMode.UP); + model.setValue("yem_e_interestamt", setScale, rowIdx); + BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,calculate,10); + yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10); + yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, 100,10); + model.setValue("yem_e_creditamt", yem_e_creditamt, rowIdx); } /**