fix:
--投保金额(USD)取值逻辑调整:原逻辑:取投保金额(原币种),调整后:取订舱投保金额(原币种)
This commit is contained in:
parent
1fa01c4665
commit
995f6cec9b
@ -109,7 +109,8 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn
|
||||
BigDecimal yemRaprate = dynamicObject.getBigDecimal("yem_raprate");
|
||||
addNew.set("yem_exchangereceipts", yemRaprate);
|
||||
//订舱投保金额(原币种)
|
||||
addNew.set("yem_bookinginsured",storageAmount.multiply(yemRaprate).divide(new BigDecimal(100) ,2));
|
||||
BigDecimal bigDecimal = storageAmount.multiply(yemRaprate).divide(new BigDecimal(100), 2);
|
||||
addNew.set("yem_bookinginsured", bigDecimal);
|
||||
// 预收金额
|
||||
addNew.set("yem_preamt_cd", raprate.multiply(storageAmount).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP));
|
||||
// 合同认领金额
|
||||
@ -127,7 +128,7 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn
|
||||
|
||||
if ("USD".equals(currency)) {
|
||||
// 投保金额(美元)
|
||||
addNew.set("yem_usacreditamt_cd", storageAmount.multiply(yemRaprate).divide(new BigDecimal(100) ,2));
|
||||
addNew.set("yem_usacreditamt_cd", bigDecimal);
|
||||
|
||||
} else {
|
||||
storageAmount = BigDecimal.ZERO;
|
||||
@ -144,7 +145,7 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn
|
||||
BigDecimal sinosurerate = (BigDecimal) dynamicObject.get("yem_sinosurerate");
|
||||
addNew.set("yem_sinosurerate_cd", sinosurerate);
|
||||
// yem_insuranceamt_cd = yem_usacreditamt_cd * yem_sinosurerate_cd / 100
|
||||
BigDecimal insuranceamt = storageAmount.multiply(sinosurerate).divide(new BigDecimal("100"), 10, RoundingMode.HALF_UP);
|
||||
BigDecimal insuranceamt = bigDecimal.multiply(sinosurerate).divide(new BigDecimal("100"), 10, RoundingMode.HALF_UP);
|
||||
// 保险费
|
||||
addNew.set("yem_insuranceamt_cd", insuranceamt);
|
||||
// 信用期限
|
||||
|
Loading…
Reference in New Issue
Block a user