修改vip价格和活动价格同时存在时得bug
This commit is contained in:
@@ -382,7 +382,9 @@ 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){
|
||||||
price = shopProductService.getVipPrice(product);
|
if (shopProductService.getVipPrice(product).compareTo(BigDecimal.ZERO)>0){
|
||||||
|
price = shopProductService.getVipPrice(product);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!handleStock(buyOrderProduct, product)) {
|
if (!handleStock(buyOrderProduct, product)) {
|
||||||
return R.error(500, "库存不足");
|
return R.error(500, "库存不足");
|
||||||
|
|||||||
Reference in New Issue
Block a user