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

Merge pull request #91 from LQYBill/release 

Release 2.4.1
pull/8040/head
Qiuyi LI 2024-07-02 14:53:34 +02:00 committed by GitHub
parent 43b9dd22ab cb5fb614b2
commit 3c783bc673
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 4 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/api/shopify/CreateFulfillmentRequest.java
View File

@ -43,7 +43,7 @@ public class CreateFulfillmentRequest extends ShopifyRequest {
POST_NL("https://postnl.post/", "PostNL International Mail", "LS[0-9]{9}NL"), 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]*"), 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"), 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; private final String trackingUrl;

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
View File

@ -449,7 +449,8 @@
</select> </select>
<select id="fetchOrderInShopsReadyForShopifySync" resultType="org.jeecg.modules.business.entity.PlatformOrderShopSync"> <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 FROM platform_order po join shop s ON po.shop_id = s.id
WHERE erp_code IN WHERE erp_code IN
<foreach <foreach

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