This commit is contained in:
linfso 2025-07-04 14:55:22 +08:00
parent f7f6be2e6d
commit a573ff1f9e

View File

@ -521,6 +521,12 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
log.info("网点机场短驳费:计算公式:" + calcExprStr + ",重量:" + waybill.getBillWeight().stripTrailingZeros().toPlainString());
// 如果计算出来的成本大于单项收费取成本费用
if(costFee > totalDbCostFee.doubleValue()){
costFee=totalDbCostFee.doubleValue();
calcExprStr=totalDbCostFee.stripTrailingZeros().toPlainString();
}
costFee = WaybillHelper.calcSettledFee(costFee, quotePriceItem.getPriceType());
BigDecimal splitCostFee = BigDecimal.valueOf(costFee);
@ -620,6 +626,12 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
log.info("机场提货费操作费:计算公式:" + calcExprStr + ",重量:" + waybill.getBillWeight().stripTrailingZeros().toPlainString());
// 如果计算出来的成本大于单项收费取成本费用
if(costFee > totalDbCostFee.doubleValue()){
costFee=totalDbCostFee.doubleValue();
calcExprStr=totalDbCostFee.stripTrailingZeros().toPlainString();
}
costFee = WaybillHelper.calcSettledFee(costFee, quotePriceItem.getPriceType());
BigDecimal splitCostFee = BigDecimal.valueOf(costFee);
@ -951,6 +963,12 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
log.info("按票分摊:计算公式:" + calcExprStr + ",票数:1");
}
// 如果计算出来的成本大于单项收费取成本费用
if(costFee > feeItem.getCnyFee().doubleValue()){
costFee=feeItem.getCnyFee().doubleValue();
calcExprStr=feeItem.getCnyFee().stripTrailingZeros().toPlainString();
}
BigDecimal splitCostFee = BigDecimal.valueOf(costFee).setScale(2,BigDecimal.ROUND_HALF_UP);
splitItem.setCostFee(splitCostFee);
splitItem.setCalcExpr(itemCalcExpr);