github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,748 Commits
3 Branches
68 Tags
146 MiB
Commit Graph

1748 Commits (cdd7f29d4a6b9d9969e90b454caa77220cd5b4e7)

Author SHA1 Message Date
Qiuyi LI 98e7abf35c Merge branch 'refs/heads/release' into dev 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java
#	pom.xml
 2024-12-10 14:56:41 +01:00
Qiuyi LI 6c12d2d461
Merge pull request #122 from LQYBill/feat/editInvoice 
Feat/edit invoice
 2024-12-10 14:48:55 +01:00
Gauthier LO 8cf45c1389 feat: (WIP) download invoice details over period, MabangSkuStockUpdateJob added clients param, fixes 2024-12-10 12:33:46 +01:00
Qiuyi LI a1132aa15d Update project version 2024-12-09 10:47:47 +01:00
Qiuyi LI ab76c1dafd Disable USPS tracking pattern 2024-12-09 10:35:50 +01:00
Qiuyi LI 25975dbf62 Add new transport company tracking pattern 2024-12-09 10:23:19 +01:00
Qiuyi LI 893352d294 Update project version 2024-12-09 10:22:35 +01:00
Qiuyi LI 63866dee0f Add new and update tracking number patterns 2024-11-29 14:56:56 +01:00
Gauthier LO f8e66e6208 feat : extra fees, fixes 2024-11-27 16:19:26 +01:00
Qiuyi LI 94c7afb6d1 Update project version 2024-11-26 10:08:53 +01:00
Qiuyi LI fc3135725a Hotfix : add regex for new canvases 2024-11-26 10:08:28 +01:00
Gauthier LO e528d9f947 fix: disabling edit when invoice number not null 2024-11-22 15:49:05 +01:00
Gauthier LO f5b88dcc70 feat: extra fee entities and CRUD 2024-11-22 12:28:04 +01:00
Gauthier LO 70a0805032 feat: extra fee entities and CRUD 2024-11-22 12:27:48 +01:00
Qiuyi LI 1a77d159f1 Add spring mongo dependency 2024-10-29 16:08:22 +01:00
Qiuyi LI 40b1e6e1a0 Add missing } 2024-10-29 14:28:52 +01:00
Qiuyi LI 437502212c
Merge pull request #109 from LQYBill/feat/sku_weight 
Feat/SKU weight
 2024-10-29 12:22:19 +01:00
Qiuyi LI 76c92020ad
Merge branch 'dev' into feat/sku_weight 2024-10-29 12:22:07 +01:00
Qiuyi LI 1c4f1286b8
Merge pull request #120 from LQYBill/feat/client_category_migrate_to_shop 
feat: product order improvement
 2024-10-29 11:02:33 +01:00
Qiuyi LI a3ec072954
Merge pull request #121 from LQYBill/release 
Release
 2024-10-28 11:53:54 +01:00
Qiuyi LI 65ea714fbe Update project version 2024-10-28 11:52:33 +01:00
Qiuyi LI 4cd650d242 Hotfix : NPE check 2024-10-28 11:51:01 +01:00
Qiuyi LI 28d9bcf9fd Update project version 2024-10-28 11:21:53 +01:00
Qiuyi LI 38e2825f9b Hotfix : Skip applying non-matching rules if there isn't any 2024-10-28 11:21:18 +01:00
Gauthier LO 8b80a4134c feat: product order improvement 2024-10-23 15:50:15 +02:00
Gauthier LO f90e02666b cleanup 2024-10-21 10:56:17 +02:00
Qiuyi LI 1808c131c6
Merge pull request #119 from LQYBill/release 
Release 2.9.1
 2024-10-17 17:52:23 +02:00
Qiuyi LI c2656ac2d6 Hotfix : Remove useless tubes 2024-10-17 17:51:24 +02:00
Qiuyi LI 404aaa3900 Update project version 2024-10-17 10:47:23 +02:00
Qiuyi LI c0cb73f213 Hotfix : Use order create time instead of order passage time for listing potential Shouman orders 2024-10-17 10:46:25 +02:00
Qiuyi LI abf75cf84b
Merge pull request #118 from LQYBill/release 
Release 2.9.0
 2024-10-15 15:00:19 +02:00
Qiuyi LI e74994a5bb Release 2.9.0 2024-10-15 11:25:25 +02:00
Qiuyi LI d8a00b20ba Hotfix for AddPortraitTubeJob : use new tube for single 40cm canvases 2024-10-15 11:25:04 +02:00
Qiuyi LI 3fe1d6e700
Merge pull request #117 from LQYBill/dev 
Prepare release 2.9.0
 2024-10-15 11:02:42 +02:00
Qiuyi LI 8bc536c585
Merge pull request #116 from LQYBill/shouman_api 
Shouman api
 2024-10-14 16:16:54 +02:00
Qiuyi LI dee3f4be13 Continue resolving conflicts 2024-10-14 16:15:43 +02:00
Qiuyi LI f32e44fc04 Merge branch 'refs/heads/dev' into shouman_api 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PlatformOrderController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderService.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java
 2024-10-14 16:06:32 +02:00
Qiuyi LI 4638618ae8 Add Shouman-related API routes 2024-10-14 15:30:57 +02:00
Qiuyi LI d827c3b9ed Create model ShoumanOrderRequest 2024-10-14 15:30:10 +02:00
Qiuyi LI b30434cf82 Add service to fetch shouman order contents 2024-10-14 15:29:46 +02:00
Qiuyi LI 210441cd89 Add service to fetch shouman orders 2024-10-14 15:29:26 +02:00
Gauthier LO daf958f84f feat: SKU builder, mongo sync sku, mabang sku sync 2024-10-04 17:29:48 +02:00
Qiuyi LI 431d2049bd Remove useless country mapper from OrderCreationRequestBody 2024-09-18 17:30:49 +02:00
Gauthier LO 214552dbb3 feat: sku erpCode builder 2024-09-06 10:04:07 +02:00
Qiuyi LI a65977668e
Merge pull request #114 from LQYBill/release 
Release
 2024-09-05 12:09:05 +02:00
Qiuyi LI bff407dc02 Release 2.8.0 2024-09-05 12:07:43 +02:00
Qiuyi LI dbaca2675b
Merge pull request #113 from LQYBill/dev 
Prepare release 2.8.0
 2024-09-05 11:45:26 +02:00
Qiuyi LI 406a609b61
Merge pull request #107 from LQYBill/feat/skuToCsv 
Feat/SKU to csv
 2024-09-05 11:35:59 +02:00
Qiuyi LI 1456e2eb43
Merge pull request #112 from LQYBill/feature/general_gift_job 
General gift job
 2024-09-05 11:32:04 +02:00
Qiuyi LI 5fd182f06f Improve the process of deciding whether gift insertion is needed by reducing old gift map before comparison of two maps 2024-09-05 11:25:05 +02:00