Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松
2025-10-27 10:31:19 +08:00
2 changed files with 3 additions and 2 deletions

View File

@@ -401,7 +401,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setUserId(userInfo.getId());
}
//会员价校验
if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) {
if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == null
|| shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) {
throw new ValidateException("生成支付订单失败,仅会员可使用会员价");
}