限时折扣 与会员价
This commit is contained in:
@@ -943,7 +943,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
if (limitRate.getFoodType() == 2 && !limitRate.getFoodIds().contains(orderDetail.getProductId())) {
|
if (limitRate.getFoodType() == 2 && !limitRate.getFoodIds().contains(orderDetail.getProductId())) {
|
||||||
throw new CzgException("限时折扣使用失败,商品" + orderDetail.getProductName() + "不享受限时折扣");
|
throw new CzgException("限时折扣使用失败,商品" + orderDetail.getProductName() + "不享受限时折扣");
|
||||||
}
|
}
|
||||||
if (!isVipPrice || "limit-time".equals(limitRate.getDiscountPriority())) {
|
|
||||||
if (orderDetail.getPrice().compareTo(BigDecimal.ZERO) == 0) {
|
if (orderDetail.getPrice().compareTo(BigDecimal.ZERO) == 0) {
|
||||||
orderDetail.setUnitPrice(orderDetail.getPrice());
|
orderDetail.setUnitPrice(orderDetail.getPrice());
|
||||||
} else {
|
} else {
|
||||||
@@ -954,11 +953,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
.setScale(2, RoundingMode.CEILING)
|
.setScale(2, RoundingMode.CEILING)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
orderDetail.setUnitPrice(
|
|
||||||
(orderDetail.getMemberPrice() == null || orderDetail.getMemberPrice().compareTo(BigDecimal.ZERO) <= 0)
|
|
||||||
? orderDetail.getPrice() : orderDetail.getMemberPrice());
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (isVipPrice) {
|
if (isVipPrice) {
|
||||||
orderDetail.setUnitPrice(
|
orderDetail.setUnitPrice(
|
||||||
|
|||||||
Reference in New Issue
Block a user