|
|
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 |
|
|
|
ed8fdb3422
|
feat: 新增用户真实姓名字段及修改订单逻辑
|
2024-07-23 15:08:51 +08:00 |
|
|
|
31d4826466
|
feat: 添加'rose'属性到产品库存管理
|
2024-07-23 11:00:59 +08:00 |
|
|
|
26dd7aaeb7
|
feat(order): 调整订单逻辑优先级
|
2024-07-23 09:13:27 +08:00 |
|
|
|
1df72153dd
|
feat(OrderLogic): 修正用户 ship 为 5 时订单价格计算逻辑
|
2024-07-23 08:58:55 +08:00 |
|
|
|
20203c2733
|
feat: 修改用户余额增加减少描述
|
2024-07-22 17:45:12 +08:00 |
|
|
|
7976c10080
|
refactor(CapitalFlowLogic): 修改用户余额充值和退还的描述信息
|
2024-07-22 17:40:39 +08:00 |
|
|
|
c3bca1b8a1
|
feat(process/Task.php): 调整任务调度，增加定时任务处理逻辑
|
2024-07-22 17:38:57 +08:00 |
|
|
|
1f91bb1e0b
|
feat(CartList): 修改购物车商品价格计算逻辑
|
2024-07-22 17:13:38 +08:00 |
|
|
|
02aa52cd3f
|
feat: 增加'receipts'字段更新功能和用户收货地址查询
|
2024-07-22 17:03:16 +08:00 |
|
|
|
841d3a632a
|
feat: 修改OrderList和OrderLogic类以改进验证码的base64编码方式
|
2024-07-22 16:34:28 +08:00 |
|
|
|
3f75281438
|
feat: 修正了购物车和订单列表中的代码错误，并优化了零售订单列表的验证码生成逻辑。
|
2024-07-22 16:14:18 +08:00 |
|
|
|
c834e81c28
|
修复支付后库存要销量增加问题
|
2024-07-22 15:40:54 +08:00 |
|
|
|
2e267e2f6a
|
feat: 修改了CommissionLogic, StoreFinanceFlowLogic, StoreOrderLogic 和 Task 文件中的代码逻辑
|
2024-07-22 15:30:46 +08:00 |
|
|
|
bdd0784d3e
|
feat(order): 修改订单逻辑，调整会员待返回金额计算方式
|
2024-07-22 14:30:40 +08:00 |
|
|
|
5c24c8713e
|
feat: 修改购物车列表价格计算逻辑
|
2024-07-22 13:56:30 +08:00 |
|
|
|
5b95bfcd49
|
feat: 修改了商品删除功能和购物车列表API
|
2024-07-22 13:54:56 +08:00 |
|
|
|
d3224144e7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-22 11:26:37 +08:00 |
|
