From 8b1569896c00393dc581032f136392adcc2c9f8f Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Fri, 28 Jun 2024 14:30:09 +0200
Subject: [PATCH 1/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 058acedf5..60fe74950 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.3.1
+WIA APP Version: 2.4.0
 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 72ccc0a56..565e4bb01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-   <version>2.3.1</version>
+   <version>2.4.0</version>
   <packaging>pom</packaging>
   <name>WIA APP ${project.version}</name>
 

From eacec4b6c8808e3019676a0b79df1da593018183 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Fri, 28 Jun 2024 15:13:19 +0200
Subject: [PATCH 2/4] Hotfix : Use local tracking number when present for
 shopify syncing

---
 .../jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
index d8877ca09..b0b90e519 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
@@ -449,7 +449,8 @@
     </select>
 
     <select id="fetchOrderInShopsReadyForShopifySync" resultType="org.jeecg.modules.business.entity.PlatformOrderShopSync">
-        SELECT po.platform_order_id, po.tracking_number, s.shopify_prefix, s.shopify_token, po.postcode
+        SELECT po.platform_order_id, COALESCE(po.local_tracking_number, po.tracking_number) as tracking_number,
+        s.shopify_prefix, s.shopify_token, po.postcode
         FROM platform_order po join shop s ON po.shop_id = s.id
         WHERE erp_code IN
         <foreach

From 244135658efe4f874185c04b7b1cb8ed5e7e6fb8 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Fri, 28 Jun 2024 15:13:41 +0200
Subject: [PATCH 3/4] Update CJ Logistics tracking number pattern

---
 .../business/domain/api/shopify/CreateFulfillmentRequest.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/api/shopify/CreateFulfillmentRequest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java
index e7019df65..816ca48cc 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java
@@ -43,7 +43,7 @@ public class CreateFulfillmentRequest extends ShopifyRequest {
         POST_NL("https://postnl.post/", "PostNL International Mail", "LS[0-9]{9}NL"),
         COLI_COLI("https://www.colicoli.fr/trackings?id=%s", "Coli Coli", "CC[0-9]{14}[A-Z]*"),
         LUXEMBOURG_POST("https://www.post.lu/particuliers/colis-courrier/track-and-trace#/search", "Luxembourg Post", "LL[0-9]{9}LU"),
-        CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|59012[0-9]{7}"),
+        CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|59012[0-9]{7}|57476[0-9]{7}"),
         ;
 
         private final String trackingUrl;

From cb5fb614b231f89149f2f45e868e6c65628edbcc Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Fri, 28 Jun 2024 15:14:10 +0200
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 60fe74950..b65ae1d7a 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.4.0
+WIA APP Version: 2.4.1
 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 565e4bb01..d32c7f671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-   <version>2.4.0</version>
+   <version>2.4.1</version>
   <packaging>pom</packaging>
   <name>WIA APP ${project.version}</name>