|
|
527dd756ec
|
feat: 新增分享获得还功能
|
2024-07-27 15:23:01 +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 |
|
|
|
1a884b691e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-27 14:53:13 +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 |
|
|
|
eae37a1142
|
feat: 移除调试代码增加代码整洁性
|
2024-07-26 17:39:03 +08:00 |
|
|
|
ddc9a82766
|
feat(order): 增加订单参数打印调试
|
2024-07-26 17:38:47 +08:00 |
|
|
|
279cc7d903
|
feat: 修改订单逻辑以更新商品统计记录和财务流水
|
2024-07-26 16:53:35 +08:00 |
|
|
|
9bc69d71fe
|
feat: 添加了订单财务流产品模型
|
2024-07-26 16:39:28 +08:00 |
|
|
|
6d6374db71
|
feat: 修改CommissionProductLogic和PayNotifyLogic类以计算商品流通
|
2024-07-26 16:00:51 +08:00 |
|
|
|
a92f33d490
|
feat: 修改CommissionProductLogic计算佣金产品逻辑
|
2024-07-26 15:32:24 +08:00 |
|
|
|
83f81a3974
|
feat: 修改分润逻辑以优化计算方式
|
2024-07-26 15:06:47 +08:00 |
|
|
|
8f9ba883a2
|
feat(StoreOrderCartInfoLists): 修改商品信息查询逻辑
|
2024-07-26 11:55:19 +08:00 |
|
|
|
5cf7dd76b9
|
feat: 移除用户余额收入记录代码
|
2024-07-26 11:51:30 +08:00 |
|
|
|
0d10483162
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into rose
|
2024-07-26 11:37:22 +08:00 |
|
|
|
7264546a3a
|
feat(BaseLikeController): 对象数据转为数组
|
2024-07-26 11:36:53 +08:00 |
|
|
|
4e67edcc77
|
feat: 添加真实姓名字段到用户列表
|
2024-07-26 11:31:05 +08:00 |
|
|
|
945fdac2c2
|
feat: 添加门店ID字段到用户列表
|
2024-07-26 10:17:30 +08:00 |
|
|
|
0c1b3ed5da
|
feat(UserLists.php): 移除用户编号列
|
2024-07-26 10:06:58 +08:00 |
|
|
|
30230df638
|
feat(CommissionProductLogic): 根据毛利率计算分配产品流水
|
2024-07-25 17:59:15 +08:00 |
|
|
|
1ffd1193c1
|
feat: 添加了根据毛利率计算产品流的功能
|
2024-07-25 17:33:05 +08:00 |
|
|
|
f132fb7f9b
|
feat: 添加对不存在商品信息的过滤
|
2024-07-25 14:20:34 +08:00 |
|
|
|
78aa37bb3b
|
feat: 修改了OrderLogic和PayNotifyLogic类，添加了'rose'字段查询和支付通知逻辑。
|
2024-07-25 11:41:49 +08:00 |
|
|
|
de036da9fb
|
Merge pull request 'refactor(UserLists.php): 优化了会员时间的处理逻辑' (#53) from rose into dev
Reviewed-on: #53
|
2024-07-25 11:41:15 +08:00 |
|
|
|
f4d45c7e5e
|
refactor(UserLists.php): 优化了会员时间的处理逻辑
|
2024-07-25 11:37:13 +08:00 |
|
|
|
08a079ab15
|
Merge pull request 'feat(UserLists.php): 修改会员等级判断逻辑' (#52) from rose into dev
Reviewed-on: #52
|
2024-07-25 09:47:02 +08:00 |
|
|
|
fb5fe6574a
|
feat(UserLists.php): 修改会员等级判断逻辑
|
2024-07-25 09:46:43 +08:00 |
|
|
|
483c029388
|
Merge pull request 'feat: 添加了对用户列表查询中VIP时间的显示' (#51) from rose into dev
Reviewed-on: #51
|
2024-07-25 09:43:57 +08:00 |
|
|
|
dedf7434b3
|
feat: 添加了对用户列表查询中VIP时间的显示
|
2024-07-25 09:43:36 +08:00 |
|
|
|
7076f0bb30
|
Merge pull request 'feat: 添加了对会员时间的格式化处理' (#50) from rose into dev
Reviewed-on: #50
|
2024-07-25 09:39:50 +08:00 |
|
|
|
c94d247261
|
feat: 添加了对会员时间的格式化处理
|
2024-07-25 09:39:28 +08:00 |
|
|
|
d50382f17e
|
Merge pull request 'rose' (#49) from rose into dev
Reviewed-on: #49
|
2024-07-25 09:35:29 +08:00 |
|
|
|
d1e7124518
|
feat: 修正了用户订单中默认地址的获取逻辑，并添加了地址创建时间的记录。
|
2024-07-23 15:45:37 +08:00 |
|
|
|
9560b4f2be
|
feat: 添加地址API省份、城市、区、街道、村、队信息录入
|
2024-07-23 15:24:06 +08:00 |
|
