github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #121 from LQYBill/release 

Release
pull/8040/head
Qiuyi LI 2024-10-28 11:53:54 +01:00 committed by GitHub
parent 1808c131c6 65ea714fbe
commit a3ec072954
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddGiftJob.java
View File

@ -178,7 +178,7 @@ public class AddGiftJob implements Job {
.collect(groupingBy(orderItem -> giftSkuSet.contains(orderItem.getErpCode()))); .collect(groupingBy(orderItem -> giftSkuSet.contains(orderItem.getErpCode())));
for (OrderItem orderItem : orderItemMap.get(Boolean.FALSE)) { for (OrderItem orderItem : orderItemMap.get(Boolean.FALSE)) {
String erpCode = orderItem.getErpCode(); String erpCode = orderItem.getErpCode();
if (!nonMatchingRulesApplied) { if (!nonMatchingRulesApplied && nonMatchingQuantityRules != null) {
for (GiftRule giftRule : nonMatchingQuantityRules) { for (GiftRule giftRule : nonMatchingQuantityRules) {
if (erpCode.matches(giftRule.getRegex())) { if (erpCode.matches(giftRule.getRegex())) {
nonMatchingRulesApplied = true; nonMatchingRulesApplied = true;

2
jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
View File

@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE}
${AnsiColor.BRIGHT_GREEN} ${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} Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
Website: www.wia-sourcing.com Website: www.wia-sourcing.com
${AnsiColor.BLACK} ${AnsiColor.BLACK}

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId> <artifactId>jeecg-boot-parent</artifactId>
<version>2.9.1</version> <version>2.9.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WIA APP ${project.version}</name> <name>WIA APP ${project.version}</name>