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

1534 Commits (1a77d159f17128cd7afffa1b056ece765b8908d1)

Author SHA1 Message Date
Qiuyi LI 0259dfbf1e Remove unused methods 2024-08-14 12:07:02 +02:00
Gauthier LO 219969433d
Update SkuToCsvJob.java 2024-08-09 09:41:05 +02:00
Qiuyi LI 94b53e2437
Merge pull request #108 from LQYBill/release 
Release
 2024-08-07 16:03:26 +02:00
Gauthier LO ba7691f4bc Merge branch 'dev' of github.com:LQYBill/wia_app into feat/skuToCsv 2024-08-07 11:57:17 +02:00
Gauthier LO 45fb4370e8 feat: sku to CSV 2024-08-07 11:57:02 +02:00
Qiuyi LI 0c809bd1d4 Update project version 2024-08-07 11:52:00 +02:00
Qiuyi LI a04b379934 Update CJ Logistics tracking number pattern 2024-08-07 11:51:08 +02:00
Qiuyi LI 7cf0c63400 Update project version 2024-08-06 16:45:46 +02:00
Qiuyi LI e7823cd0d2
Merge pull request #106 from LQYBill/dev 
Release 2.7.0
 2024-08-06 16:31:29 +02:00
Qiuyi LI 73b09a5f81
Merge pull request #105 from LQYBill/release 
Released 2.6.1
 2024-08-06 16:22:49 +02:00
Qiuyi LI 2931199968
Merge pull request #104 from LQYBill/jch8_add_card_job 
Create job to add card to every order of JCH8 KR shop when there's none
 2024-08-06 16:19:49 +02:00
Qiuyi LI f96847ecbc Create job to add card to every order of JCH8 KR shop when there's none 2024-08-06 16:12:21 +02:00
Qiuyi LI 345ea35c8c Release 2.6.1 2024-08-05 16:30:56 +02:00
Qiuyi LI 60ca4b7e3f
Merge pull request #103 from LQYBill/dev 
Prepare release 2.6.1
 2024-08-05 15:19:06 +02:00
Qiuyi LI e58a5f209d
Merge pull request #101 from LQYBill/feat/previousLogisticChannelPrice 
Feat/previous logistic channel price
 2024-08-05 14:20:46 +02:00
Qiuyi LI cd69dbf270
Merge pull request #100 from LQYBill/fix/pdf 
fix: pdf now will stay in one page
 2024-08-05 14:20:12 +02:00
Qiuyi LI dab28f53e6
Merge pull request #102 from LQYBill/fix/invoiceTotal 
Fix/invoice total
 2024-08-05 14:19:52 +02:00
Gauthier LO dd7c44fdcb clean 2024-08-05 13:36:53 +02:00
Gauthier LO f80f1ed6eb fix again 2024-08-05 13:36:08 +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
Gauthier LO c76d7b9992 picking fee per item for overseas warehouse 2024-08-01 12:47:43 +02:00
Gauthier LO 4f322a9290 fix 2024-08-01 12:40:06 +02:00
Gauthier LO 8b144a43d4 feat: better logistic channel price comparison 2024-08-01 11:57:12 +02:00
Gauthier LO 450e9f0846 fix: pdf now will stay in one page 2024-08-01 11:56:13 +02:00
Qiuyi LI 5fac98b60a
Merge pull request #99 from LQYBill/release 
Release 2.6.0
 2024-07-31 11:09:31 +02:00
Qiuyi LI 822d6abdf1 Release 2.6.0 2024-07-31 10:38:17 +02:00
Qiuyi LI 47b8740a21
Merge pull request #98 from LQYBill/dev 
Prepare release 2.6.0
 2024-07-31 10:32:51 +02:00
Qiuyi LI 58fde4e98d
Merge pull request #96 from LQYBill/fix/mabangJobOverridingContent 
fix: mabang job, overriding order content
 2024-07-29 12:06:14 +02:00
Qiuyi LI 03725b7109
Merge pull request #97 from LQYBill/feat/shippingFeeDiff 
Feat : shipping fee difference
 2024-07-29 12:05:43 +02:00
Gauthier LO cbb066032e Feat : shipping fee difference 2024-07-29 11:56:01 +02:00
Gauthier LO 054de34b54 something 2024-07-29 10:05:31 +02:00
Gauthier LO 964e30f16d fix: mabang job, overriding order content 2024-07-04 16:12:50 +02:00
Qiuyi LI 7a773aa3dc
Merge pull request #95 from LQYBill/feat/orderManagementTriggerSync 
Feat/order management trigger sync
 2024-07-04 15:32:29 +02:00
Gauthier LO 223bc3c4c0 feat: order management now triggers mabang order sync on success 2024-07-04 15:21:14 +02:00
Qiuyi LI 5ffd09b8a8
Merge pull request #94 from LQYBill/feat/updateSkuJob 
feat: sku update job
 2024-07-04 11:11:03 +02:00
Gauthier LO 536b0230a0 feat: sku update job 2024-07-04 11:06:30 +02:00
Qiuyi LI 3d195deaef
Merge pull request #93 from LQYBill/release 
Release 2.5.1
 2024-07-02 17:20:28 +02:00
Qiuyi LI 730088a6ba Update project version 2024-07-02 17:11:44 +02:00
Qiuyi LI bc442b304e Hotfix 2.5.1 : Quit job when no local tracking number can be updated 2024-07-02 17:11:06 +02:00
Qiuyi LI 008f9ad78e Merge remote-tracking branch 'origin/release' into release 2024-07-02 16:36:19 +02:00
Qiuyi LI 761308c470 Release 2.5.0 2024-07-02 16:34:11 +02:00
Qiuyi LI 0fb7958db6
Merge pull request #92 from LQYBill/dev 
Prepare release 2.5.0
 2024-07-02 16:24:16 +02:00
Qiuyi LI 33078697c2
Merge pull request #89 from LQYBill/feat/clientChangeOrderInfo 
feat : client orders management
 2024-07-02 15:49:07 +02:00
Qiuyi LI 26a7b39dc7
Merge branch 'dev' into feat/clientChangeOrderInfo 2024-07-02 15:38:04 +02:00
Qiuyi LI 3c783bc673
Merge pull request #91 from LQYBill/release 
Release 2.4.1
 2024-07-02 14:53:34 +02:00
Gauthier LO 97793b76b4 feat: better pagination and new filter logic for skuOrderPage 2024-07-02 14:35:21 +02:00
Gauthier LO af3540274c cleanup 2024-06-28 17:03:56 +02:00