From a93df406cf85c17bf514b91bb1b2250248e182c9 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Thu, 6 Mar 2025 14:22:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E9=93=B6=E8=A1=8C=E5=88=A9=E6=81=AF?= =?UTF-8?q?=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C=E5=B8=81?= =?UTF-8?q?=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+=E7=A9=BA?= =?UTF-8?q?=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+=E6=B8=AF?= =?UTF-8?q?=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E5=8C=85=E5=B9=B2=EF=BC=89*=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87=E7=99=BE?= =?UTF-8?q?=E5=88=86=E6=AF=94%*=E5=88=A9=E6=81=AF=E7=8E=87/100/360*?= =?UTF-8?q?=E5=88=A9=E6=81=AF=E5=A4=A9=E6=95=B0=20=20=20=E4=BF=A1=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C=E5=B8=81?= =?UTF-8?q?=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+=E7=A9=BA?= =?UTF-8?q?=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+=E6=B8=AF?= =?UTF-8?q?=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E5=8C=85=E5=B9=B2+=E9=93=B6=E8=A1=8C=E5=88=A9?= =?UTF-8?q?=E6=81=AF=E8=B4=B9=EF=BC=89*=E6=94=B6=E6=AC=BE=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E4=BF=A1=E4=BF=9D?= =?UTF-8?q?=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94%*=E4=BF=A1=E4=BF=9D=E8=B4=B9=E7=8E=87/100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/im/clientdemand/utils/ClientUtils.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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); } /**