|
|
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 |
|
|
|
a573f817f5
|
1
|
2024-08-02 11:01:17 +08:00 |
|
|
|
37c9cbd064
|
Merge pull request 'erp' (#76) from erp into rose
Reviewed-on: #76
|
2024-08-01 22:54:19 +08:00 |
|
|
|
d0842aadc5
|
1
|
2024-08-01 22:41:52 +08:00 |
|
|
|
66571b43a1
|
feat(purchase_order): 添加合并今日商户和平台订单功能
|
2024-08-01 18:03:45 +08:00 |
|
|
|
4711643bb8
|
Merge pull request 'feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式' (#75) from erp into rose
Reviewed-on: #75
|
2024-08-01 16:53:53 +08:00 |
|
|
|
a6031b3318
|
feat(SystemStoreStorageLists): 优化了系统商店存储列表的商品名称和图片获取方式
|
2024-08-01 16:53:26 +08:00 |
|
|
|
af6e8e2387
|
Merge pull request 'feat: 修改仓库产品逻辑和库存发送队列，增加财务PM判断逻辑' (#74) from erp into rose
Reviewed-on: #74
|
2024-08-01 16:47:05 +08:00 |
|
|
|
a5ccb95cf2
|
feat: 修改仓库产品逻辑和库存发送队列，增加财务PM判断逻辑
|
2024-08-01 16:46:25 +08:00 |
|
|
|
55daad5815
|
Merge pull request 'feat: 添加仓库信息功能' (#73) from erp into rose
Reviewed-on: #73
|
2024-08-01 15:46:53 +08:00 |
|
|
|
e550772d12
|
feat: 添加仓库信息功能
|
2024-08-01 15:42:58 +08:00 |
|
|
|
a54adbd928
|
Merge pull request 'erp' (#72) from erp into rose
Reviewed-on: #72
|
2024-08-01 14:06:51 +08:00 |
|
|
|
75a2338337
|
feat: 添加了仓库产品确认操作
|
2024-08-01 13:59:30 +08:00 |
|
|
|
a441b94e94
|
feat: 添加仓库和商品仓储信息的管理功能
|
2024-07-31 18:07:22 +08:00 |
|
|
|
bc40d950aa
|
Merge pull request 'feat(store_order): 添加查询订单支付状态功能' (#70) from dev into rose
Reviewed-on: #70
|
2024-07-31 12:00:16 +08:00 |
|
|
|
1df7f8740a
|
feat(store_order): 添加查询订单支付状态功能
|
2024-07-31 11:59:49 +08:00 |
|
|
|
14d1ca8c11
|
Merge pull request 'feat(PayNotifyLogic): 添加订单支付成功推送通知功能' (#69) from dev into rose
Reviewed-on: #69
|
2024-07-31 11:45:06 +08:00 |
|
|
|
64821a9a3b
|
feat(PayNotifyLogic): 添加订单支付成功推送通知功能
|
2024-07-31 11:44:39 +08:00 |
|
|
|
f451525aa9
|
Merge pull request 'dev' (#68) from dev into rose
Reviewed-on: #68
|
2024-07-31 11:26:37 +08:00 |
|
|
|
27a71efb07
|
feat: 增加微信支付码支付功能
|
2024-07-31 11:25:55 +08:00 |
|
|
|
4bc8092931
|
feat(ExceptionHandler): 修改异常处理以优化响应
|
2024-07-31 11:11:49 +08:00 |
|
|
|
ddaef44baf
|
feat: 新增采购订单列表及详情模型与控制器
|
2024-07-30 17:19:09 +08:00 |
|
