修改vip价格和活动价格同时存在时得bug

This commit is contained in:
wuchunlei
2025-07-07 14:38:21 +08:00
parent 29000617d8
commit 8e60975ba9

View File

@@ -382,8 +382,10 @@ public class BuyOrderController {
BigDecimal price = getRealPrice(product); BigDecimal price = getRealPrice(product);
if (buyOrder.getVipDiscountAmount()!=null&&buyOrder.getVipDiscountAmount().compareTo(new BigDecimal(0))>0 if (buyOrder.getVipDiscountAmount()!=null&&buyOrder.getVipDiscountAmount().compareTo(new BigDecimal(0))>0
&&userVipService.isVip()&&product.getIsVipPrice()==1){ &&userVipService.isVip()&&product.getIsVipPrice()==1){
if (shopProductService.getVipPrice(product).compareTo(BigDecimal.ZERO)>0){
price = shopProductService.getVipPrice(product); price = shopProductService.getVipPrice(product);
} }
}
if (!handleStock(buyOrderProduct, product)) { if (!handleStock(buyOrderProduct, product)) {
return R.error(500, "库存不足"); return R.error(500, "库存不足");
} }