Merge pull request #91 from LQYBill/release

Release 2.4.1

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;

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

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.1
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 Website: www.wia-sourcing.com
 ${AnsiColor.BLACK}

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.1</version>
   <packaging>pom</packaging>
   <name>WIA APP ${project.version}</name>