Merge branch 'dev' into prod

This commit is contained in:
2025-11-14 09:45:36 +08:00

View File

@@ -487,7 +487,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} else {
BigDecimal discount = BigDecimal.valueOf(100).subtract(BigDecimal.valueOf(shopUser.getDiscount())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
BigDecimal discountAmount = newTotalAmount.multiply(discount);
discountAmount = discountAmount.setScale(2, RoundingMode.HALF_UP);
discountAmount = discountAmount.setScale(2, RoundingMode.HALF_DOWN);
if (discountAmount.compareTo(param.getVipDiscountAmount()) != 0) {
log.info("会员整单折扣金额不正确:传递为:{},计算为:{}", param.getVipDiscountAmount(), discountAmount);
throw new OrderValidateException("生成支付订单失败,会员整单折扣金额不正确");