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..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) { + if (!nonMatchingRulesApplied && nonMatchingQuantityRules != null) { for (GiftRule giftRule : nonMatchingQuantityRules) { if (erpCode.matches(giftRule.getRegex())) { nonMatchingRulesApplied = true; 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..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.1 +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 131bc1c81..41906d74c 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.3 pom WIA APP ${project.version}