1731 Commits

Author SHA1 Message Date
mkm
219f64ec7d Merge pull request 'feat: 修改订单控制器与列表,增强错误处理与功能,优化代码结构' (#120) from dev into main
Reviewed-on: #120
2024-08-10 09:54:33 +08:00
mkm
09d157d81a feat: 修改订单控制器与列表,增强错误处理与功能,优化代码结构 2024-08-10 09:18:57 +08:00
mkm
fe85e166a7 Merge pull request 'dev' (#119) from dev into main
Reviewed-on: #119
2024-08-09 15:14:34 +08:00
mkm
8b7e043dc9 feat: 修改仓库产品控制器,增强错误处理与库存检查,优化代码结构 2024-08-09 15:11:59 +08:00
mkm
297864ea9e feat: 修改库存管理逻辑,增强库存检查与错误处理,优化代码结构 2024-08-09 15:11:32 +08:00
mkm
d8f25a30dc Merge pull request 'feat(ListsExcelTrait): 修改了Excel导出功能,将http协议改为https,提高安全性' (#118) from dev into main
Reviewed-on: #118
2024-08-09 11:11:56 +08:00
mkm
5f1cd1aa65 feat(ListsExcelTrait): 修改了Excel导出功能,将http协议改为https,提高安全性 2024-08-09 11:11:28 +08:00
mkm
b2ca315c00 Merge pull request 'feat: 添加设置配送员功能' (#117) from dev into main
Reviewed-on: #117
2024-08-08 15:40:53 +08:00
mkm
6049aca86f feat: 添加设置配送员功能 2024-08-08 15:40:00 +08:00
mkm
c20dbe164a Merge pull request 'feat: 修改仓库产品逻辑以优化代码结构' (#116) from dev into main
Reviewed-on: #116
2024-08-08 14:01:35 +08:00
mkm
4056fff9c1 feat: 修改仓库产品逻辑以优化代码结构 2024-08-08 11:53:24 +08:00
mkm
df486be9fd Merge pull request 'feat: 修改仓库产品控制器与逻辑,增强错误处理与库存检查' (#115) from dev into main
Reviewed-on: #115
2024-08-08 09:55:00 +08:00
mkm
308595da3c feat: 修改仓库产品控制器与逻辑,增强错误处理与库存检查 2024-08-08 09:54:22 +08:00
mkm
baef4af3c7 Merge pull request 'feat: 添加了新的条码支付订单通知功能,优化了支付逻辑,提高了支付成功率' (#114) from dev into main
Reviewed-on: #114
2024-08-07 21:26:44 +08:00
mkm
d7f03993bf feat: 添加了新的条码支付订单通知功能,优化了支付逻辑,提高了支付成功率 2024-08-07 21:26:13 +08:00
mkm
fc87dbf824 Merge pull request 'feat: 修改仓库产品逻辑函数,移除数据库事务处理' (#113) from dev into main
Reviewed-on: #113
2024-08-07 17:34:32 +08:00
mkm
0375951b3f feat: 修改仓库产品逻辑函数,移除数据库事务处理 2024-08-07 17:33:58 +08:00
mkm
673a77fde6 Merge pull request 'feat: 添加根据产品ID或仓库名称搜索的功能' (#112) from dev into main
Reviewed-on: #112
2024-08-07 16:17:28 +08:00
mkm
1bae9607d8 feat: 添加根据产品ID或仓库名称搜索的功能 2024-08-07 16:16:53 +08:00
mkm
22f3b8f66c Merge pull request 'dev' (#111) from dev into main
Reviewed-on: #111
2024-08-07 15:59:31 +08:00
mkm
919b4ba034 feat: 增加订单购物详情列表导出功能 2024-08-07 15:49:58 +08:00
mkm
8ea1011492 feat: 添加商品库存查询功能 2024-08-07 13:45:14 +08:00
mkm
dbb933f12f feat: 重构了库存管理功能,优化了库存添加逻辑,新增了库存状态查询功能 2024-08-07 11:50:56 +08:00
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