mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,560 Commits 14 Branches 15 Tags
Commit Graph

361 Commits

Author SHA1 Message Date
mkm
42afe19d91 Merge pull request 'dev' (#106) from dev into rose 
Reviewed-on: #106
 2024-08-06 11:25:20 +08:00
mkm
962f0055d0 feat: 修改了仓库产品列表的搜索条件 2024-08-06 11:24:12 +08:00
mkm
07e1f331ce Merge pull request 'feat: 添加存储库产品逻辑和店铺存储发送功能' (#104) from dev into rose 
Reviewed-on: #104
 2024-08-05 14:14:49 +08:00
mkm
4c6d4ff7c9 feat: 添加存储库产品逻辑和店铺存储发送功能 2024-08-05 14:14:20 +08:00
mkm
d2ecc8a166 Merge pull request 'feat(StoreBranchProductLists): Update product list logic, optimize search conditions, adjust product query fields' (#102) from dev into rose 
Reviewed-on: #102
 2024-08-04 17:58:56 +08:00
mkm
c9985dfd33 feat(StoreBranchProductLists): Update product list logic, optimize search conditions, adjust product query fields 2024-08-04 17:58:24 +08:00
mkm
dadeb89d09 Merge pull request 'feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods' (#101) from dev into rose 
Reviewed-on: #101
 2024-08-04 17:51:17 +08:00
mkm
d083b5e07d feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods 2024-08-04 17:50:48 +08:00
mkm
5f3e18fe83 Merge pull request 'feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods' (#100) from dev into rose 
Reviewed-on: #100
 2024-08-04 17:41:48 +08:00
mkm
c6bc0b41e8 feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods 2024-08-04 17:41:24 +08:00
mkm
9fc4095563 Merge pull request 'dev' (#98) from dev into rose 
Reviewed-on: #98
 2024-08-04 13:13:32 +08:00
mkm
c3a930a9e1 feat(WarehouseProductLogic): 更新仓库产品逻辑，优化商品仓储信息处理，调整库存管理方法 2024-08-04 13:12:54 +08:00
mkm
748c3c7267 feat(TradeStatisticLogic, UserStatisticLogic): Update statistic logic, optimize payment type filter conditions, adjust statistical methods 2024-08-04 10:32:28 +08:00
mkm
188904a63b Merge pull request 'dev' (#96) from dev into rose 
Reviewed-on: #96
 2024-08-03 21:18:07 +08:00
mkm
c8c7333ec7 1 2024-08-03 21:17:38 +08:00
mkm
07b1ebc3c8 feat: 添加月销售商品统计功能 2024-08-03 18:04:52 +08:00
mkm
bc385e3c2f Merge pull request 'feat: 增加查询已支付订单的条件' (#93) from dev into rose 
Reviewed-on: #93
 2024-08-03 11:37:33 +08:00
mkm
4b2c385b8b feat: 增加查询已支付订单的条件 2024-08-03 11:37:11 +08:00
mkm
93969124e2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into rose 2024-08-03 11:26:11 +08:00
mkm
d9fca4bf15 feat: 修改了库存管理逻辑以支持仓库库存查询和更新 2024-08-03 11:22:35 +08:00
mkm
89775fdccb feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式 2024-08-03 00:09:11 +08:00
mkm
02835aab30 feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式 2024-08-03 00:07:48 +08:00
mkm
87f40a0b04 feat(StoreOrderController, PayNotifyLogic, StoreFinanceFlowLogic): 更新订单处理流程，优化退款逻辑，调整资金流动记录处理方式 2024-08-02 23:56:37 +08:00
mkm
9b1f3cb967 Merge pull request 'erp' (#83) from erp into dev 
Reviewed-on: #83
 2024-08-02 20:01:08 +08:00
mkm
f120ad28be Merge pull request 'feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理' (#82) from erp into rose 
Reviewed-on: #82
 2024-08-02 19:58:21 +08:00
mkm
5863d9d113 feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理 2024-08-02 19:56:15 +08:00
mkm
b7ea08c41c Merge pull request 'feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件' (#81) from erp into rose 
Reviewed-on: #81
 2024-08-02 19:46:23 +08:00
mkm
315fd540ba feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件 2024-08-02 19:43:21 +08:00
mkm
4e9857d9f5 Merge pull request 'feat: 增加根据条件筛选订单功能' (#80) from erp into rose 
Reviewed-on: #80
 2024-08-02 17:48:33 +08:00
mkm
3745015592 feat: 增加根据条件筛选订单功能 2024-08-02 17:44:00 +08:00
mkm
57997f4a19 Merge remote-tracking branch 'origin/dev' into rose 2024-08-02 15:53:54 +08:00
mkm
e4b785e186 feat: 修改了商品支付金额、礼品券消耗、充值金额等交易统计逻辑，并更新了相关描述。 2024-08-02 15:52:12 +08:00
mkm
e36c9416c4 Merge pull request '1' (#77) from erp into rose 
Reviewed-on: #77
 2024-08-02 11:02:42 +08:00
mkm
a573f817f5 1 2024-08-02 11:01:17 +08:00
mkm
37c9cbd064 Merge pull request 'erp' (#76) from erp into rose 
Reviewed-on: #76
 2024-08-01 22:54:19 +08:00
mkm
d0842aadc5 1 2024-08-01 22:41:52 +08:00
mkm
66571b43a1 feat(purchase_order): 添加合并今日商户和平台订单功能 2024-08-01 18:03:45 +08:00
mkm
4711643bb8 Merge pull request 'feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式' (#75) from erp into rose 
Reviewed-on: #75
 2024-08-01 16:53:53 +08:00
mkm
a6031b3318 feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式 2024-08-01 16:53:26 +08:00
mkm
af6e8e2387 Merge pull request 'feat: 修改仓库产品逻辑和库存发送队列，增加财务PM判断逻辑' (#74) from erp into rose 
Reviewed-on: #74
 2024-08-01 16:47:05 +08:00
mkm
a5ccb95cf2 feat: 修改仓库产品逻辑和库存发送队列，增加财务PM判断逻辑 2024-08-01 16:46:25 +08:00
mkm
55daad5815 Merge pull request 'feat: 添加仓库信息功能' (#73) from erp into rose 
Reviewed-on: #73
 2024-08-01 15:46:53 +08:00
mkm
e550772d12 feat: 添加仓库信息功能 2024-08-01 15:42:58 +08:00
mkm
a54adbd928 Merge pull request 'erp' (#72) from erp into rose 
Reviewed-on: #72
 2024-08-01 14:06:51 +08:00
mkm
75a2338337 feat: 添加了仓库产品确认操作 2024-08-01 13:59:30 +08:00
mkm
a441b94e94 feat: 添加仓库和商品仓储信息的管理功能 2024-07-31 18:07:22 +08:00
mkm
ddaef44baf feat: 新增采购订单列表及详情模型与控制器 2024-07-30 17:19:09 +08:00
mkm
a790577276 Merge pull request 'dev' (#61) from dev into rose 
Reviewed-on: #61
 2024-07-29 14:43:37 +08:00
mkm
6a9dc9ddc2 feat: 重构订单退款逻辑并优化代码结构 2024-07-29 14:35:10 +08:00
mkm
518d9fe064 Merge branch 'rose' of https://gitea.lihaink.cn/mkm/multi-store into rose 2024-07-27 11:52:44 +08:00