github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,212 Commits
4 Branches
69 Tags
148 MiB
Commit Graph

1212 Commits (d827c3b9ed4818b70ccf6c5acfcbc978fdced5ca)

Author SHA1 Message Date
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
Qiuyi LI 431d2049bd Remove useless country mapper from OrderCreationRequestBody 2024-09-18 17:30:49 +02:00
Qiuyi LI 566368ec35 Add contents reducing for necklaces and gems 2024-08-14 12:08:03 +02:00
Qiuyi LI 8aa848a28e Add identifiers for necklaces and gems to ShoumanOrderContent 2024-08-14 12:07:33 +02:00
Qiuyi LI 0259dfbf1e Remove unused methods 2024-08-14 12:07:02 +02:00
Qiuyi LI 695b9be21f Update Shouman remark generation with multiple regexes 2024-08-01 17:35:12 +02:00
Qiuyi LI 983d86580e Adapt ShoumanOrderContent to the fact that now multiple regexes can exist 2024-08-01 17:34:10 +02:00
Qiuyi LI dcc862b25d Create ShoumanRegex to associate multiple regexes to one Shouman category 2024-08-01 17:32:54 +02:00
Qiuyi LI 97d8dedd98 Create enum for ring sizes 2024-08-01 17:31:50 +02:00
Qiuyi LI ee7d748206 Merge branch 'dev' into shouman_api 2024-04-03 17:04:57 +02:00
Qiuyi LI 09217a4dc7
Merge pull request #70 from LQYBill/release 
Release 1.11.1
 2024-04-03 17:04:41 +02:00
Qiuyi LI c2ba2e6c05 Release 1.11.1 2024-04-03 16:50:22 +02:00
Qiuyi LI 92b310f4d0 Bugfix: nullify optional parameters when retrieving SKUs from Mabang 2024-04-03 16:36:19 +02:00
Qiuyi LI 31ed1821d4 Code cleanup 2024-04-03 12:27:12 +02:00
Qiuyi LI dda55256c4
Merge pull request #69 from LQYBill/dev 
Prepare release of fixes 1.11.1
 2024-04-03 12:22:33 +02:00
Qiuyi LI 6876b91a27
Merge pull request #68 from LQYBill/fix/productOrderPrice 
fix : prices on product order page and allow to invoice sku with 0 qty
 2024-04-02 16:12:04 +02:00
Qiuyi LI ec15e3508c Merge branch 'dev' into shouman_api 2024-03-29 17:41:44 +01:00
Gauthier LO ce51fc3d50 fix : prices on product order page and allow to invoice sku with 0 qty 2024-03-29 17:21:06 +01:00
Qiuyi LI 21f1797d23
Merge pull request #67 from LQYBill/release 
Release 1.11.0
 2024-03-29 09:59:48 +01:00
Qiuyi LI 7d5219715b Release 1.11.0 2024-03-28 11:40:49 +01:00
Qiuyi LI 755850b198
Merge pull request #66 from LQYBill/dev 
Preparing release of 1.11.0
 2024-03-28 11:35:59 +01:00
Qiuyi LI 72a5504995
Merge pull request #65 from LQYBill/feature/invoicesCRUD 
Feature/invoices crud
 2024-03-28 11:25:51 +01:00
Gauthier LO 59240a27e0 code cleanup 2024-03-28 11:20:36 +01:00
Gauthier LO 94f93d0672 code cleanup 2024-03-28 11:17:47 +01:00
Gauthier LO 7e0a86623c Merge branch 'feature/invoicesCRUD' of github.com:LQYBill/wia_app into feature/invoicesCRUD 2024-03-28 11:01:52 +01:00
Gauthier LO 042849a820 code cleanup 2024-03-28 11:01:03 +01:00
Qiuyi LI a82944ee9a
Replace println by log.info 2024-03-28 10:18:17 +01:00
Qiuyi LI 98060a3eec
Merge pull request #64 from LQYBill/feature/createMabangPurchaseOrder 
feature : Create Mabang Purchase Order
 2024-03-28 10:13:51 +01:00
Gauthier LO e600fde681 feature : invoice page rework and much more 2024-03-27 16:53:29 +01:00
Gauthier LO 62a30a9754 fix : breakdown invoicing wrong erp status orders 2024-03-18 12:27:42 +01:00
Gauthier LO dc5713d5c4 (wip) invoice management remake 2024-03-18 10:37:46 +01:00
Qiuyi LI f4a4068e97 Add shop ERP code to ShoumanOrderContent 2024-03-15 17:31:28 +01:00
Qiuyi LI c435377fca Update project version 2024-03-14 16:06:58 +01:00
Qiuyi LI 0a372b0994 Create a job to automatically remove virtual products from Mabang orders 2024-03-14 16:06:12 +01:00
Qiuyi LI 6429a6ab2a Exclude existing order IDs when constructing new Shouman orders 2024-03-14 13:04:26 +01:00
Gauthier LO e5fe9a4989 feature : Create Mabang Purchase Order 2024-03-12 16:22:17 +01:00
Qiuyi LI 06228752d8 Update project version 2024-03-12 12:15:05 +01:00
Qiuyi LI f0bbb1c02c Update CJ_LOGISTICS tracking number pattern 2024-03-12 12:14:35 +01:00
Qiuyi LI c52c115942 Update project version 2024-03-05 16:32:04 +01:00
Qiuyi LI bbd148cb51 Apply a throttler of 40 requests per minute to ShopifySyncJob 
(cherry picked from commit 188c5601bd)
 2024-03-05 16:30:39 +01:00
Qiuyi LI d602d71e1c
Merge pull request #63 from LQYBill/shopify_auto_sync 
Apply a throttler of 40 requests per minute to ShopifySyncJob
 2024-03-05 16:27:32 +01:00
Qiuyi LI 188c5601bd Apply a throttler of 40 requests per minute to ShopifySyncJob 2024-03-05 15:53:11 +01:00
Qiuyi LI 4a7e8bdce8 Update Shouman order creation request according to provider's demand 2024-03-05 15:32:42 +01:00
Qiuyi LI 32c09f5bc9 Only take Pending orders to create Shouman orders 2024-03-05 15:31:45 +01:00
Qiuyi LI 8e84419a63 Merge branch 'dev' into shouman_api 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PlatformOrder.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml
 2024-02-29 11:47:40 +01:00
Qiuyi LI 8253ba1877
Merge pull request #62 from LQYBill/fix/addPurchaseMabang 
fix : missing content in body
 2024-02-20 17:09:03 +01:00
Qiuyi LI 4f49712e74
Merge pull request #61 from LQYBill/feature/addPurchaseMabang 
fix : mabang sku job error
 2024-02-20 17:08:46 +01:00
Gauthier LO 31fd3341f0 fix : missing content in body 2024-02-20 17:06:56 +01:00