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

1708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkm
ce9fb3da95 Merge pull request 'feat(CateLists): 更新商品分类列表搜索逻辑，移除库存筛选条件，优化搜索性能' (#109) from dev into main 
Reviewed-on: #109
 2024-08-07 00:30:59 +08:00
mkm
780248aff4 feat(CateLists): 更新商品分类列表搜索逻辑，移除库存筛选条件，优化搜索性能 2024-08-07 00:30:39 +08:00
mkm
f6867ca808 Merge pull request 'feat(OrderLogic, PayNotifyLogic): Update order and payment logic, optimize activity discount processing, adjust profit sharing methods' (#108) from dev into main 
Reviewed-on: #108
 2024-08-06 23:04:33 +08:00
mkm
86de33cd04 feat(OrderLogic, PayNotifyLogic): Update order and payment logic, optimize activity discount processing, adjust profit sharing methods 2024-08-06 23:03:19 +08:00
mkm
7488faa2e7 Merge pull request 'feat: 修改了仓库产品列表的搜索条件' (#107) from dev into main 
Reviewed-on: #107
 2024-08-06 20:46:50 +08:00
mkm
962f0055d0 feat: 修改了仓库产品列表的搜索条件 2024-08-06 11:24:12 +08:00
mkm
d67a0039d0 Merge pull request 'dev' (#105) from dev into main 
Reviewed-on: #105
 2024-08-05 20:07:14 +08:00
mkm
5a602cc59a feat: 修改了用户提现和余额相关的API 2024-08-05 17:47:51 +08:00
mkm
4c6d4ff7c9 feat: 添加存储库产品逻辑和店铺存储发送功能 2024-08-05 14:14:20 +08:00
mkm
cf4d260dd5 Merge pull request 'dev' (#103) from dev into main 
Reviewed-on: #103
 2024-08-04 21:19:28 +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
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
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
f0546b9aff feat(StoreOrderLists): 更新订单列表处理逻辑，优化已支付订单显示方式，调整支付状态筛选条件 2024-08-04 14:26:20 +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
1b537882c0 Merge pull request 'dev' (#97) from dev into main 
Reviewed-on: #97
 2024-08-03 21:22:29 +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
cf8c5e8f64 feat: 修改日志处理类以支持不同级别的日志文件 2024-08-03 14:01:26 +08:00
mkm
a32b98ae85 Merge pull request 'dev' (#94) from dev into main 
Reviewed-on: #94
 2024-08-03 11:46:15 +08:00
mkm
4b2c385b8b feat: 增加查询已支付订单的条件 2024-08-03 11:37:11 +08:00
mkm
d9fca4bf15 feat: 修改了库存管理逻辑以支持仓库库存查询和更新 2024-08-03 11:22:35 +08:00
mkm
114a289c9c Merge pull request 'feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式' (#91) from dev into main 
Reviewed-on: #91
 2024-08-03 00:09:32 +08:00
mkm
89775fdccb feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式 2024-08-03 00:09:11 +08:00
mkm
1a1a28faa4 Merge pull request 'feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式' (#90) from dev into main 
Reviewed-on: #90
 2024-08-03 00:08:05 +08:00
mkm
02835aab30 feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式 2024-08-03 00:07:48 +08:00
mkm
78e0fc2a49 Merge pull request 'feat(StoreOrderController, PayNotifyLogic, StoreFinanceFlowLogic): 更新订单处理流程，优化退款逻辑，调整资金流动记录处理方式' (#89) from dev into main 
Reviewed-on: #89
 2024-08-02 23:56:58 +08:00
mkm
87f40a0b04 feat(StoreOrderController, PayNotifyLogic, StoreFinanceFlowLogic): 更新订单处理流程，优化退款逻辑，调整资金流动记录处理方式 2024-08-02 23:56:37 +08:00
mkm
bbfe7dad91 Merge pull request 'feat(PayNotifyLogic): 修改订单推送逻辑，排除特定用户，优化订单处理流程' (#88) from dev into main 
Reviewed-on: #88
 2024-08-02 21:06:32 +08:00
mkm
e0b7f75fdc feat(PayNotifyLogic): 修改订单推送逻辑，排除特定用户，优化订单处理流程 2024-08-02 21:05:55 +08:00
mkm
652b4ba9fb Merge pull request 'dev' (#87) from dev into main 
Reviewed-on: #87
 2024-08-02 20:55:50 +08:00
mkm
f33a4d4ae8 feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式 2024-08-02 20:55:28 +08:00
mkm
ee8a43b2ac feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式 2024-08-02 20:54:45 +08:00
mkm
3f9bda6bef feat(OrderLogic): 移除了生成核销码的代码，以优化订单处理流程 2024-08-02 20:50:03 +08:00
mkm
cd9051fd8b Merge pull request 'feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式' (#86) from dev into main 
Reviewed-on: #86
 2024-08-02 20:38:33 +08:00
mkm
1151b8fb4e feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式 2024-08-02 20:38:11 +08:00
mkm
45bd2b0e47 Merge pull request 'feat(OrderLogic): 修改订单逻辑，优化商品处理流程，更新商品字段获取方式' (#85) from dev into main 
Reviewed-on: #85
 2024-08-02 20:31:02 +08:00
mkm
081c89442c feat(OrderLogic): 修改订单逻辑，优化商品处理流程，更新商品字段获取方式 2024-08-02 20:30:40 +08:00
mkm
89d362b914 Merge pull request 'dev' (#84) from dev into main 
Reviewed-on: #84
 2024-08-02 20:14:26 +08:00
mkm
795d19dda3 feat(OrderLogic, PayNotifyLogic, Task): 修改订单逻辑，优化核销流程，增加资金流动逻辑及订单购物详情处理 2024-08-02 20:10:55 +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
5863d9d113 feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理 2024-08-02 19:56:15 +08:00
mkm
315fd540ba feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件 2024-08-02 19:43:21 +08:00
mkm
3745015592 feat: 增加根据条件筛选订单功能 2024-08-02 17:44:00 +08:00
mkm
e90e666738 feat: 修改订单逻辑和任务处理，优化商品处理流程 2024-08-02 17:04:09 +08:00
mkm
3e6abe5957 feat: 添加资金流动逻辑以处理商店财务 2024-08-02 16:27:55 +08:00
mkm
e4b785e186 feat: 修改了商品支付金额、礼品券消耗、充值金额等交易统计逻辑，并更新了相关描述。 2024-08-02 15:52:12 +08:00
mkm
54b2add707 feat: 新增财务流水功能 2024-08-02 12:58:31 +08:00
mkm
f464c497ab feat: 更新订单逻辑增加状态查询 2024-08-02 12:58:14 +08:00