|
|
e9e9a76b32
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 19:22:18 +08:00 |
|
|
|
6f99259a7c
|
feat(UserRechargeController): 更新采购包礼品券金额
|
2024-07-05 19:22:13 +08:00 |
|
liu
|
2d6a45c98d
|
活动期间不加冻结
|
2024-07-05 19:13:56 +08:00 |
|
|
|
de313f1bed
|
feat: 修改CapitalFlowLogic和PayNotifyLogic类中的userIncome和userExpense方法，增加新的支付类型和退款描述，优化代码格式。
|
2024-07-05 18:38:26 +08:00 |
|
|
|
b8aad3cdc2
|
feat(UserSignLogic): 修复首充逻辑判断条件
|
2024-07-05 18:32:07 +08:00 |
|
|
|
2ae218e0bd
|
feat: 移除首充逻辑中的金额判断条件
|
2024-07-05 18:12:22 +08:00 |
|
|
|
e65d201039
|
feat: 修改 UserSignLogic 类以处理订单价格类型转换
|
2024-07-05 18:02:05 +08:00 |
|
|
|
f528005b21
|
feat: 修改用户签到逻辑
|
2024-07-05 17:42:41 +08:00 |
|
liu
|
5289952597
|
对应充值逻辑
|
2024-07-05 17:22:37 +08:00 |
|
|
|
c122bcb386
|
feat(PayNotifyLogic): 重构收银台下单直接到账逻辑并移除冗余代码
|
2024-07-05 16:55:26 +08:00 |
|
|
|
b430a6242e
|
fix: 修复支付类型判断错误
|
2024-07-05 16:46:22 +08:00 |
|
|
|
eb39074822
|
feat: 修改支付通知逻辑
|
2024-07-05 16:45:54 +08:00 |
|
|
|
a8f68ff099
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-05 14:38:45 +08:00 |
|
|
|
9082a73f80
|
feat: 修改支付控制器及逻辑，优化支付成功后的处理流程，并调整会员充值计算方式。
|
2024-07-05 14:38:32 +08:00 |
|
liu
|
e67e8be75f
|
修改分润金额逻辑
|
2024-07-05 14:30:41 +08:00 |
|
|
|
f9114271ec
|
feat(UserSignLogic): 修改用户签到逻辑，增加用户充值查询
|
2024-07-05 11:52:08 +08:00 |
|
|
|
faf5fab258
|
feat: 修改用户签到逻辑
|
2024-07-05 11:34:46 +08:00 |
|
|
|
0dd6f94171
|
feat: 根据订单价格调整会员积分计算逻辑
|
2024-07-05 11:31:18 +08:00 |
|
liu
|
37f0de8c37
|
冻结相关处理
|
2024-07-05 11:14:26 +08:00 |
|
|
|
87161dd9be
|
feat: 修改支付控制器以处理不同类型的支付通知
|
2024-07-04 11:32:32 +08:00 |
|
|
|
7e2ad42b83
|
feat: 修改了CommissionLogic和PayNotifyLogic类以处理会员金额
|
2024-07-03 17:58:47 +08:00 |
|
|
|
bb44d88dd1
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-03 16:51:46 +08:00 |
|
|
|
c668f34f29
|
feat: 添加会员待返回金额计算逻辑
|
2024-07-03 16:51:32 +08:00 |
|
liu
|
6819cc3b21
|
区分小程序和收银台消息提示逻辑
|
2024-07-03 16:33:48 +08:00 |
|
liu
|
15414c2a41
|
兼容收银台展示收款信息
|
2024-07-03 10:20:58 +08:00 |
|
liu
|
40a92fbb49
|
余额和采购款推送消息
|
2024-07-03 09:31:03 +08:00 |
|
liu
|
f93f65b379
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 18:06:29 +08:00 |
|
liu
|
a77e0b5706
|
回调加入商品日志处理修改
|
2024-07-02 18:06:16 +08:00 |
|
|
|
a1bfcec42a
|
feat: 修改用户签到逻辑以增加积分
|
2024-07-02 17:56:56 +08:00 |
|
|
|
84ad33d3fc
|
feat: 移除了用户签到状态更新的代码
|
2024-07-02 17:50:55 +08:00 |
|
liu
|
5de3cf3a97
|
修改现金付款的直接修改状态
|
2024-07-02 17:48:27 +08:00 |
|
liu
|
4c511d39b3
|
修改回调除开次日回调的逻辑
|
2024-07-02 17:44:20 +08:00 |
|
|
|
576fe28098
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:39:59 +08:00 |
|
|
|
7b5fff7a3c
|
feat: 修改UserSignLogic类中的write_log方法为write方法，并调整参数，同时更新相关用户的integral。
|
2024-07-02 17:39:53 +08:00 |
|
liu
|
0af9f3f65b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:31:33 +08:00 |
|
liu
|
e085325ebc
|
修改加入商品逻辑
|
2024-07-02 17:31:19 +08:00 |
|
|
|
b17d964850
|
feat: 重构支付通知逻辑，优化了兑换券的增减操作，并移除了相关冗余代码。
|
2024-07-02 17:30:30 +08:00 |
|
|
|
7b8c960fec
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 17:02:33 +08:00 |
|
|
|
d6aaceb425
|
feat: 修改订单和支付逻辑，增加用户等级判断和积分计算
|
2024-07-02 17:02:21 +08:00 |
|
liu
|
77c14d6508
|
收银台下单库存校验
|
2024-07-02 16:33:09 +08:00 |
|
|
|
23bf1ecee8
|
feat(UserSignLogic): 修改核销商品获得逻辑并更新文档
|
2024-07-02 16:10:44 +08:00 |
|
liu
|
e5dafb1437
|
余额支付短信校验
|
2024-07-02 16:01:50 +08:00 |
|
|
|
2f443ec364
|
feat: 修改UserSignLists, UserSignLogLists和UserSignLogic类以实现新的订单处理逻辑
|
2024-07-02 15:59:47 +08:00 |
|
|
|
c78b12ec2d
|
feat(UserSignLogic): 修改用户签到逻辑，增加日志记录功能
|
2024-07-02 15:40:56 +08:00 |
|
|
|
1f122be8dc
|
feat: 增加用户签到列表API查询功能
|
2024-07-02 15:32:38 +08:00 |
|
|
|
f1e93d4aeb
|
feat(UserSignLogic): 根据订单来源调整礼品券冻结逻辑
|
2024-07-02 15:15:42 +08:00 |
|
|
|
3e72886b7a
|
feat(UserLogic): 修正用户签到逻辑错误
|
2024-07-02 15:01:05 +08:00 |
|
|
|
e9c25fd1de
|
feat: 调整用户签到逻辑以优化首充和礼品券的冻结处理
|
2024-07-02 14:51:39 +08:00 |
|
|
|
0b3fc8a7b6
|
feat: 修改用户签到逻辑和支付通知逻辑
|
2024-07-02 14:30:20 +08:00 |
|
|
|
83fce9e9dd
|
feat: 移除支付类型为3时的兑换券逻辑
|
2024-07-02 11:31:52 +08:00 |
|
