|
|
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 |
|
|
|
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 |
|
|
|
ac6d03f7b5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-27 14:59:19 +08:00 |
|
|
|
3d7d447c7d
|
feat: 修改订单逻辑以处理用户地址信息
|
2024-07-27 14:56:35 +08:00 |
|
|
|
10fbddf295
|
feat: 修改订单逻辑以支持新字段rose
|
2024-07-27 14:52:46 +08:00 |
|
|
|
227de2fe30
|
feat: 简化支付通知逻辑
|
2024-07-27 11:55:04 +08:00 |
|
|
|
518d9fe064
|
Merge branch 'rose' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-27 11:52:44 +08:00 |
|
|
|
99dc835cb1
|
feat: 添加'开通时间'字段到用户列表，修改线下分润、支付通知等逻辑
|
2024-07-27 11:52:31 +08:00 |
|
|
|
c1a0b6adec
|
Merge pull request 'feat(OrderEnum): 根据订单状态和退款状态更新订单类型' (#60) from dev into rose
Reviewed-on: #60
|
2024-07-27 10:16:58 +08:00 |
|
|
|
22c89d8ddd
|
feat(OrderEnum): 根据订单状态和退款状态更新订单类型
|
2024-07-27 10:16:28 +08:00 |
|
|
|
81072d2859
|
Merge pull request 'feat(OrderEnum): 添加退货状态查询功能' (#59) from dev into rose
Reviewed-on: #59
|
2024-07-27 10:13:28 +08:00 |
|
|
|
50dd13542e
|
feat(OrderEnum): 添加退货状态查询功能
|
2024-07-27 10:12:51 +08:00 |
|
|
|
af37f15da3
|
Merge pull request 'feat: 修改StoreOrder模型以处理订单状态的获取逻辑' (#58) from dev into rose
Reviewed-on: #58
|
2024-07-27 10:10:56 +08:00 |
|
|
|
ce0fa6c394
|
feat: 修改StoreOrder模型以处理订单状态的获取逻辑
|
2024-07-27 10:10:04 +08:00 |
|
|
|
f8806b8ada
|
Merge pull request 'feat(PayNotifyLogic): 修改用户支付通知逻辑，调整资金流动记录' (#57) from dev into rose
Reviewed-on: #57
|
2024-07-27 09:46:57 +08:00 |
|
|
|
1c1a34e618
|
feat(PayNotifyLogic): 修改用户支付通知逻辑，调整资金流动记录
|
2024-07-27 09:46:33 +08:00 |
|
|
|
49f7e50644
|
Merge pull request 'feat: 增加对余额支付的处理逻辑' (#56) from dev into rose
Reviewed-on: #56
|
2024-07-27 09:35:17 +08:00 |
|
|
|
1def86886d
|
feat: 增加对余额支付的处理逻辑
|
2024-07-27 09:34:38 +08:00 |
|
|
|
953b7db733
|
Merge pull request 'dev' (#55) from dev into rose
Reviewed-on: #55
|
2024-07-27 09:25:33 +08:00 |
|
|
|
7e99a8afa9
|
feat(CapitalFlowLogic): 修改资金流水逻辑，增加支付类型判断
|
2024-07-27 09:24:44 +08:00 |
|
