门槛计算

This commit is contained in:
2025-11-19 12:49:06 +08:00
parent 819e3755a6
commit b4ee438550

View File

@@ -778,9 +778,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} else {
if (orderDetail.getIsTimeDiscount() == 1 && isTimeDiscountShare) {
calculationAmount = calculationAmount.add(orderDetail.getUnitPrice().multiply(num).setScale(2, RoundingMode.HALF_UP));
} else if (isVipPrice && isVipShare) {
} else if (isVipPrice && orderDetail.getMemberPrice().compareTo(BigDecimal.ZERO) > 0 && isVipShare) {
calculationAmount = calculationAmount.add(orderDetail.getUnitPrice().multiply(num).setScale(2, RoundingMode.HALF_UP));
} else if (!isVipPrice && orderDetail.getIsTimeDiscount() == 0) {
} else if ((!isVipPrice || orderDetail.getMemberPrice().compareTo(BigDecimal.ZERO) <= 0) && orderDetail.getIsTimeDiscount() == 0) {
calculationAmount = calculationAmount.add(orderDetail.getPrice().multiply(num).setScale(2, RoundingMode.HALF_UP));
}
}