门槛计算1
This commit is contained in:
@@ -766,9 +766,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
if (orderDetail.getIsGift() == 1 || orderDetail.getIsTemporary() == 1) {
|
if (orderDetail.getIsGift() == 1 || orderDetail.getIsTemporary() == 1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!isAllFoods || (CollUtil.isNotEmpty(couponFoodIds) && !couponFoodIds.contains(orderDetail.getProductId()))) {
|
if (!isAllFoods) {
|
||||||
|
if (CollUtil.isEmpty(couponFoodIds) || !couponFoodIds.contains(orderDetail.getProductId())) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
BigDecimal num = orderDetail.getNum().subtract(orderDetail.getReturnNum());
|
BigDecimal num = orderDetail.getNum().subtract(orderDetail.getReturnNum());
|
||||||
if (orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
|
if (orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
|
||||||
//单品改价 按原价计算门槛金额
|
//单品改价 按原价计算门槛金额
|
||||||
|
|||||||
Reference in New Issue
Block a user