|
|
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 |
|
|
|
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 |
|
|
|
17464ff077
|
feat: 修改了订单逻辑和佣金产品逻辑，增加了对商品的库存检查，并优化了支付通知逻辑。
|
2024-07-30 16:47:22 +08:00 |
|
|
|
bcf270583b
|
feat: 增加库存更新逻辑
|
2024-07-30 14:41:37 +08:00 |
|
|
|
522af410cd
|
feat: 增加推广用户等级判断逻辑
|
2024-07-30 14:27:08 +08:00 |
|
|
|
58cf679569
|
feat: 实现订单创建功能，包括更新商品库存和销量
|
2024-07-30 14:21:57 +08:00 |
|
|
|
27f424be34
|
Merge pull request 'dev' (#66) from dev into rose
Reviewed-on: #66
|
2024-07-30 10:26:53 +08:00 |
|
|
|
d9bb85651e
|
1
|
2024-07-30 10:25:21 +08:00 |
|
|
|
ab62fbc3f1
|
Merge branch 'main' into dev
|
2024-07-29 17:40:22 +08:00 |
|
|
|
1f336cc6e2
|
Merge pull request 'feat: 修改OrderWetchaPushSend类以优化商品信息格式' (#64) from dev into rose
Reviewed-on: #64
|
2024-07-29 17:16:36 +08:00 |
|
|
|
a746ed879f
|
feat: 修改OrderWetchaPushSend类以优化商品信息格式
|
2024-07-29 17:15:46 +08:00 |
|
|
|
db336e476f
|
Merge pull request 'feat(OrderWetchaPushSend.php): 修改商品信息展示，增加单位显示' (#63) from dev into rose
Reviewed-on: #63
|
2024-07-29 17:11:58 +08:00 |
|
|
|
f55d444799
|
feat(CommissionProductLogic): 修改了CommissionProductLogic类中的判断条件，移除了用户船只类型5的判断，改为判断商品的顶级分类ID是否为15189。
|
2024-07-29 17:09:05 +08:00 |
|
|
|
665f56cee9
|
feat: 修改CommissionProductLogic类以支持更多用户船舶类型
|
2024-07-29 16:52:51 +08:00 |
|
|
|
b548c5f5c2
|
feat(OrderWetchaPushSend.php): 修改商品信息展示，增加单位显示
|
2024-07-29 16:42:45 +08:00 |
|
|
|
c4e69f99f7
|
Merge branch 'rose' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-29 16:37:12 +08:00 |
|
|
|
a89a555f7c
|
fix: 修正产品佣金逻辑错误
|
2024-07-29 16:37:05 +08:00 |
|
|
|
0d86926915
|
Merge pull request 'dev' (#62) from dev into rose
Reviewed-on: #62
|
2024-07-29 16:16:41 +08:00 |
|
|
|
b48ed7d80e
|
Merge branch 'rose' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-29 16:16:08 +08:00 |
|
