|
@@ -408,7 +408,7 @@ public class ParkingWalletFeeService {
|
|
|
// 本次预计服务费 = 采购数量 * 实际计费单价,金额保留2位小数;开关关闭时固定返回0。
|
|
// 本次预计服务费 = 采购数量 * 实际计费单价,金额保留2位小数;开关关闭时固定返回0。
|
|
|
BigDecimal estimatedServiceFee = chargeStrategySwitchOpen
|
|
BigDecimal estimatedServiceFee = chargeStrategySwitchOpen
|
|
|
? param.getPurchaseQuantity().multiply(currentStrategyUnitFee).setScale(2, RoundingMode.HALF_UP)
|
|
? param.getPurchaseQuantity().multiply(currentStrategyUnitFee).setScale(2, RoundingMode.HALF_UP)
|
|
|
- : ZERO_AMOUNT;
|
|
|
|
|
|
|
+ : ZERO_AMOUNT.setScale(2, RoundingMode.HALF_UP);
|
|
|
log.info("服务费预估金额计算完成,企业id:{}, 采购数量:{}, 实际计费单价:{}, 预计服务费:{}",
|
|
log.info("服务费预估金额计算完成,企业id:{}, 采购数量:{}, 实际计费单价:{}, 预计服务费:{}",
|
|
|
entId, param.getPurchaseQuantity(), currentStrategyUnitFee, estimatedServiceFee);
|
|
entId, param.getPurchaseQuantity(), currentStrategyUnitFee, estimatedServiceFee);
|
|
|
|
|
|
|
@@ -1129,7 +1129,7 @@ public class ParkingWalletFeeService {
|
|
|
KwtParkingWalletFee walletFee = queryWalletFee(proEntId, supEntId);
|
|
KwtParkingWalletFee walletFee = queryWalletFee(proEntId, supEntId);
|
|
|
if (walletFee == null || walletFee.getServiceFeeBalance() == null) {
|
|
if (walletFee == null || walletFee.getServiceFeeBalance() == null) {
|
|
|
log.info("查询服务费余额为空,按0处理,proEntId:{}, supEntId:{}", proEntId, supEntId);
|
|
log.info("查询服务费余额为空,按0处理,proEntId:{}, supEntId:{}", proEntId, supEntId);
|
|
|
- return ZERO_AMOUNT;
|
|
|
|
|
|
|
+ return ZERO_AMOUNT.setScale(2, RoundingMode.HALF_UP);
|
|
|
}
|
|
}
|
|
|
log.info("查询服务费余额成功,proEntId:{}, supEntId:{}, serviceFeeBalance:{}",
|
|
log.info("查询服务费余额成功,proEntId:{}, supEntId:{}, serviceFeeBalance:{}",
|
|
|
proEntId, supEntId, walletFee.getServiceFeeBalance());
|
|
proEntId, supEntId, walletFee.getServiceFeeBalance());
|