门槛计算1

This commit is contained in:
2025-11-14 17:39:21 +08:00
parent c04dbbe870
commit 8ee1d07833

View File

@@ -766,8 +766,10 @@ 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) {
continue; if (CollUtil.isEmpty(couponFoodIds) || !couponFoodIds.contains(orderDetail.getProductId())) {
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) {