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

1752 Commits (1ab137869a0d76fc64d1239c2ba92b771c4725d7)

Author SHA1 Message Date
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
Qiuyi LI 3ca6fca694 Create AddGiftJob 2024-09-04 17:29:51 +02:00
Qiuyi LI adb767030a Hotfix for AddPortraitTubeJob : add missing case for only one new 36cm canvas in order 2024-09-04 17:17:31 +02:00
Qiuyi LI d17769cff3 Old SKU data become Triple, adding erpOrderItemId as differentiator in parameters in case of multiple SKU of same quantity 2024-09-04 17:16:23 +02:00
Qiuyi LI 36c0df4e3d Create model and service for GiftRules 2024-09-04 17:08:31 +02:00
Qiuyi LI 8f4c39d178
Merge pull request #111 from LQYBill/release 
Release 2.7.2
 2024-08-29 14:14:55 +02:00
Qiuyi LI fccffe27d3 Update project version 2024-08-29 14:14:09 +02:00
Qiuyi LI 95c5e1f29a
Merge pull request #110 from LQYBill/dev 
Hotfix 2.7.2
 2024-08-29 14:13:23 +02:00
Qiuyi LI 964527e04a Update portrait tubes adding algorithm 2024-08-29 14:01:20 +02:00
Qiuyi LI a63e24ddf5 Remove unused methods 2024-08-29 14:00:22 +02:00
Gauthier LO e6b548cf83 feat : update SKU isGift via MabangSkuSyncJob,add groupId to PurchaseOrderPage 2024-08-26 14:30:50 +02:00
Gauthier LO 694fbb3115 feat : sku weight finished, grafana, loki, loki4j 2024-08-26 10:53:15 +02:00
Gauthier LO e5fb4d9220 feat : sku weight edit, (WIP) mongo installed 2024-08-20 15:13:10 +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
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