1546 Commits

Author SHA1 Message Date
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
mkm
7cad2bf8a2 Merge pull request 'feat(order): 修改订单逻辑,优化财务流水查询' (#78) from dev into main
Reviewed-on: #78
2024-08-02 11:23:46 +08:00
mkm
18c58f58f5 feat(order): 修改订单逻辑,优化财务流水查询 2024-08-02 11:19:47 +08:00
mkm
a573f817f5 1 2024-08-02 11:01:17 +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
a6031b3318 feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式 2024-08-01 16:53:26 +08:00
mkm
a5ccb95cf2 feat: 修改仓库产品逻辑和库存发送队列,增加财务PM判断逻辑 2024-08-01 16:46:25 +08:00
mkm
e550772d12 feat: 添加仓库信息功能 2024-08-01 15:42:58 +08:00
mkm
75a2338337 feat: 添加了仓库产品确认操作 2024-08-01 13:59:30 +08:00
mkm
a944304865 Merge pull request 'dev' (#71) from dev into main
Reviewed-on: #71
2024-07-31 21:59:42 +08:00
mkm
a441b94e94 feat: 添加仓库和商品仓储信息的管理功能 2024-07-31 18:07:22 +08:00
mkm
1df7f8740a feat(store_order): 添加查询订单支付状态功能 2024-07-31 11:59:49 +08:00