|
|
42afe19d91
|
Merge pull request 'dev' (#106) from dev into rose
Reviewed-on: #106
|
2024-08-06 11:25:20 +08:00 |
|
|
|
962f0055d0
|
feat: 修改了仓库产品列表的搜索条件
|
2024-08-06 11:24:12 +08:00 |
|
|
|
5a602cc59a
|
feat: 修改了用户提现和余额相关的API
|
2024-08-05 17:47:51 +08:00 |
|
|
|
07e1f331ce
|
Merge pull request 'feat: 添加存储库产品逻辑和店铺存储发送功能' (#104) from dev into rose
Reviewed-on: #104
|
2024-08-05 14:14:49 +08:00 |
|
|
|
4c6d4ff7c9
|
feat: 添加存储库产品逻辑和店铺存储发送功能
|
2024-08-05 14:14:20 +08:00 |
|
|
|
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 |
|
|
|
c9985dfd33
|
feat(StoreBranchProductLists): Update product list logic, optimize search conditions, adjust product query fields
|
2024-08-04 17:58:24 +08:00 |
|
|
|
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 |
|
|
|
d083b5e07d
|
feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods
|
2024-08-04 17:50:48 +08:00 |
|
|
|
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 |
|
|
|
c6bc0b41e8
|
feat(StoreProductController, WarehouseProductLists, StoreStorageSend): Update stock management logic, optimize inventory checking, adjust storage management methods
|
2024-08-04 17:41:24 +08:00 |
|
|
|
60ee9295c6
|
Merge pull request 'feat(StoreOrderLists): 更新订单列表处理逻辑，优化已支付订单显示方式，调整支付状态筛选条件' (#99) from dev into rose
Reviewed-on: #99
|
2024-08-04 14:26:48 +08:00 |
|
|
|
f0546b9aff
|
feat(StoreOrderLists): 更新订单列表处理逻辑，优化已支付订单显示方式，调整支付状态筛选条件
|
2024-08-04 14:26:20 +08:00 |
|
|
|
9fc4095563
|
Merge pull request 'dev' (#98) from dev into rose
Reviewed-on: #98
|
2024-08-04 13:13:32 +08:00 |
|
|
|
c3a930a9e1
|
feat(WarehouseProductLogic): 更新仓库产品逻辑，优化商品仓储信息处理，调整库存管理方法
|
2024-08-04 13:12:54 +08:00 |
|
|
|
748c3c7267
|
feat(TradeStatisticLogic, UserStatisticLogic): Update statistic logic, optimize payment type filter conditions, adjust statistical methods
|
2024-08-04 10:32:28 +08:00 |
|
|
|
188904a63b
|
Merge pull request 'dev' (#96) from dev into rose
Reviewed-on: #96
|
2024-08-03 21:18:07 +08:00 |
|
|
|
c8c7333ec7
|
1
|
2024-08-03 21:17:38 +08:00 |
|
|
|
07b1ebc3c8
|
feat: 添加月销售商品统计功能
|
2024-08-03 18:04:52 +08:00 |
|
|
|
cbfcfb70cd
|
Merge pull request 'feat: 修改日志处理类以支持不同级别的日志文件' (#95) from dev into rose
Reviewed-on: #95
|
2024-08-03 14:05:00 +08:00 |
|
|
|
cf8c5e8f64
|
feat: 修改日志处理类以支持不同级别的日志文件
|
2024-08-03 14:01:26 +08:00 |
|
|
|
bc385e3c2f
|
Merge pull request 'feat: 增加查询已支付订单的条件' (#93) from dev into rose
Reviewed-on: #93
|
2024-08-03 11:37:33 +08:00 |
|
|
|
4b2c385b8b
|
feat: 增加查询已支付订单的条件
|
2024-08-03 11:37:11 +08:00 |
|
|
|
93969124e2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-08-03 11:26:11 +08:00 |
|
|
|
d9fca4bf15
|
feat: 修改了库存管理逻辑以支持仓库库存查询和更新
|
2024-08-03 11:22:35 +08:00 |
|
|
|
89775fdccb
|
feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式
|
2024-08-03 00:09:11 +08:00 |
|
|
|
02835aab30
|
feat(TradeStatisticLogic): 更新交易统计逻辑，优化支付类型筛选条件，调整统计方式
|
2024-08-03 00:07:48 +08:00 |
|
|
|
87f40a0b04
|
feat(StoreOrderController, PayNotifyLogic, StoreFinanceFlowLogic): 更新订单处理流程，优化退款逻辑，调整资金流动记录处理方式
|
2024-08-02 23:56:37 +08:00 |
|
|
|
e0b7f75fdc
|
feat(PayNotifyLogic): 修改订单推送逻辑，排除特定用户，优化订单处理流程
|
2024-08-02 21:05:55 +08:00 |
|
|
|
f33a4d4ae8
|
feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式
|
2024-08-02 20:55:28 +08:00 |
|
|
|
ee8a43b2ac
|
feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式
|
2024-08-02 20:54:45 +08:00 |
|
|
|
3f9bda6bef
|
feat(OrderLogic): 移除了生成核销码的代码，以优化订单处理流程
|
2024-08-02 20:50:03 +08:00 |
|
|
|
1151b8fb4e
|
feat(OrderLogic): 更新订单逻辑，优化商品处理流程，调整商品字段获取方式
|
2024-08-02 20:38:11 +08:00 |
|
|
|
081c89442c
|
feat(OrderLogic): 修改订单逻辑，优化商品处理流程，更新商品字段获取方式
|
2024-08-02 20:30:40 +08:00 |
|
|
|
795d19dda3
|
feat(OrderLogic, PayNotifyLogic, Task): 修改订单逻辑，优化核销流程，增加资金流动逻辑及订单购物详情处理
|
2024-08-02 20:10:55 +08:00 |
|
|
|
9b1f3cb967
|
Merge pull request 'erp' (#83) from erp into dev
Reviewed-on: #83
|
2024-08-02 20:01:08 +08:00 |
|
|
|
f120ad28be
|
Merge pull request 'feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理' (#82) from erp into rose
Reviewed-on: #82
|
2024-08-02 19:58:21 +08:00 |
|
|
|
5863d9d113
|
feat(StoreOrderCartInfoGroupLists, StoreOrderCartInfoTwoLists): 优化了商品单位、分类和店铺名称的获取方式，增加了空值处理
|
2024-08-02 19:56:15 +08:00 |
|
|
|
b7ea08c41c
|
Merge pull request 'feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件' (#81) from erp into rose
Reviewed-on: #81
|
2024-08-02 19:46:23 +08:00 |
|
|
|
315fd540ba
|
feat(StoreOrderCartInfoController): 添加了列表二功能及对应搜索条件
|
2024-08-02 19:43:21 +08:00 |
|
|
|
4e9857d9f5
|
Merge pull request 'feat: 增加根据条件筛选订单功能' (#80) from erp into rose
Reviewed-on: #80
|
2024-08-02 17:48:33 +08:00 |
|
|
|
3745015592
|
feat: 增加根据条件筛选订单功能
|
2024-08-02 17:44:00 +08:00 |
|
|
|
e90e666738
|
feat: 修改订单逻辑和任务处理，优化商品处理流程
|
2024-08-02 17:04:09 +08:00 |
|
|
|
3e6abe5957
|
feat: 添加资金流动逻辑以处理商店财务
|
2024-08-02 16:27:55 +08:00 |
|
|
|
57997f4a19
|
Merge remote-tracking branch 'origin/dev' into rose
|
2024-08-02 15:53:54 +08:00 |
|
|
|
e4b785e186
|
feat: 修改了商品支付金额、礼品券消耗、充值金额等交易统计逻辑，并更新了相关描述。
|
2024-08-02 15:52:12 +08:00 |
|
|
|
54b2add707
|
feat: 新增财务流水功能
|
2024-08-02 12:58:31 +08:00 |
|
|
|
f464c497ab
|
feat: 更新订单逻辑增加状态查询
|
2024-08-02 12:58:14 +08:00 |
|
|
|
18c58f58f5
|
feat(order): 修改订单逻辑，优化财务流水查询
|
2024-08-02 11:19:47 +08:00 |
|
|
|
e36c9416c4
|
Merge pull request '1' (#77) from erp into rose
Reviewed-on: #77
|
2024-08-02 11:02:42 +08:00 |
|
