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 |
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 |