|
|
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 |
|
|
|
c3d1de3671
|
feat: 添加新功能计算产品佣金
|
2024-07-29 16:16:02 +08:00 |
|
|
|
6879da0968
|
feat: 添加对store_id的查询条件
|
2024-07-29 15:59:12 +08:00 |
|
|
|
fa559efd5c
|
feat(OrderController): 修改拆单逻辑，增加退款判断
|
2024-07-29 15:06:33 +08:00 |
|
|
|
a790577276
|
Merge pull request 'dev' (#61) from dev into rose
Reviewed-on: #61
|
2024-07-29 14:43:37 +08:00 |
|
|
|
2d3b99b370
|
feat(OrderController): 增加退款申请成功后的返回信息
|
2024-07-29 14:39:44 +08:00 |
|
|
|
6a9dc9ddc2
|
feat: 重构订单退款逻辑并优化代码结构
|
2024-07-29 14:35:10 +08:00 |
|
|
|
3cc738e6c3
|
feat: 移除了CommissionProductLogic中的调试代码
|
2024-07-27 18:05:14 +08:00 |
|
|
|
8e2e9c0fa8
|
feat: 修改产品佣金计算逻辑
|
2024-07-27 18:00:44 +08:00 |
|
|
|
9117e3eb89
|
feat: 修改CommissionProductLogic类以计算佣金
|
2024-07-27 17:41:32 +08:00 |
|
|
|
6ddcab62b6
|
feat: 修改CommissionProductLogic类的a方法
|
2024-07-27 17:32:41 +08:00 |
|
|
|
58423f1b01
|
feat: 修改了CommissionProductLogic类中的计算逻辑，根据用户等级和商品rose值进行不同的计算和存储操作。
|
2024-07-27 17:27:52 +08:00 |
|
|
|
b5e2707c3c
|
feat: 调整佣金计算逻辑以区分门店和平台收入
|
2024-07-27 17:06:03 +08:00 |
|
|
|
fcf6efe6ae
|
refactor: 调整代码风格和格式
|
2024-07-27 16:45:26 +08:00 |
|
|
|
8056fce1da
|
feat(CommissionLogic): 根据订单类型和ID查询费用并记录用户余额收入
|
2024-07-27 16:41:36 +08:00 |
|
|
|
8d0b39c8e0
|
feat: 修改CommissionProductLogic以处理不同类型的用户
|
2024-07-27 16:35:12 +08:00 |
|
|
|
46fdf20b47
|
feat: 修改CommissionProductLogic类以调整分销逻辑
|
2024-07-27 16:12:33 +08:00 |
|
|
|
665c8e89d2
|
feat: 修改计算商品流程方法，优化了代码结构，并调整了参数，使其更符合逻辑。
|
2024-07-27 15:55:10 +08:00 |
|
|
|
527dd756ec
|
feat: 新增分享获得还功能
|
2024-07-27 15:23:01 +08:00 |
|
|
|
71126e9ecb
|
feat(OrderLogic): 修正用户地址队伍拼接错误
|
2024-07-27 15:00:20 +08:00 |
|
|
|
b141ac8fad
|
feat(OrderLogic): 修正用户地址队伍拼接错误
|
2024-07-27 14:59:53 +08:00 |
|
