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 |
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
|
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 |
Qiuyi LI
|
431d2049bd
|
Remove useless country mapper from OrderCreationRequestBody
|
2024-09-18 17:30:49 +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 |
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 |
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 |