From 38e2825f9b328bb9acbaeed0d8e2fcf596f15c26 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 28 Oct 2024 11:21:18 +0100 Subject: [PATCH] Hotfix : Skip applying non-matching rules if there isn't any --- .../java/org/jeecg/modules/business/domain/job/AddGiftJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddGiftJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddGiftJob.java index 97648708c..4e151dacd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddGiftJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddGiftJob.java @@ -178,7 +178,7 @@ public class AddGiftJob implements Job { .collect(groupingBy(orderItem -> giftSkuSet.contains(orderItem.getErpCode()))); for (OrderItem orderItem : orderItemMap.get(Boolean.FALSE)) { String erpCode = orderItem.getErpCode(); - if (!nonMatchingRulesApplied) { + if (!nonMatchingRulesApplied && !nonMatchingQuantityRules.isEmpty()) { for (GiftRule giftRule : nonMatchingQuantityRules) { if (erpCode.matches(giftRule.getRegex())) { nonMatchingRulesApplied = true;