From 38e2825f9b328bb9acbaeed0d8e2fcf596f15c26 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 28 Oct 2024 11:21:18 +0100 Subject: [PATCH 1/4] 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; From 28d9bcf9fd29b6c11927494cd1f971686f43f6c6 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 28 Oct 2024 11:21:53 +0100 Subject: [PATCH 2/4] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index 1842dd8b1..afc1b53f2 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 2.9.1 +WIA APP Version: 2.9.2 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index 131bc1c81..b33c350e4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - 2.9.1 + 2.9.2 pom WIA APP ${project.version} From 4cd650d242ac0fe71678b919e2b49cb519903c2f Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 28 Oct 2024 11:51:01 +0100 Subject: [PATCH 3/4] Hotfix : NPE check --- .../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 4e151dacd..51aba6ecf 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 && !nonMatchingQuantityRules.isEmpty()) { + if (!nonMatchingRulesApplied && nonMatchingQuantityRules != null) { for (GiftRule giftRule : nonMatchingQuantityRules) { if (erpCode.matches(giftRule.getRegex())) { nonMatchingRulesApplied = true; From 65ea714fbef72295638af485719adb31d4ee79e1 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 28 Oct 2024 11:52:33 +0100 Subject: [PATCH 4/4] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index afc1b53f2..782894177 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 2.9.2 +WIA APP Version: 2.9.3 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index b33c350e4..41906d74c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - 2.9.2 + 2.9.3 pom WIA APP ${project.version}