|
|
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 |
|
|
|
13d4ac1fad
|
feat(UserShipLists): 根据type_id判断是否添加搜索条件
|
2024-07-02 14:42:26 +08:00 |
|
|
|
0b3fc8a7b6
|
feat: 修改用户签到逻辑和支付通知逻辑
|
2024-07-02 14:30:20 +08:00 |
|
|
|
78a44016e5
|
rename: 重命名用户签到模型文件
|
2024-07-02 11:46:40 +08:00 |
|
|
|
83fce9e9dd
|
feat: 移除支付类型为3时的兑换券逻辑
|
2024-07-02 11:31:52 +08:00 |
|
|
|
4b849edc76
|
feat(UserController): 更新用户签到逻辑，修复积分计算错误
|
2024-07-02 11:02:00 +08:00 |
|
|
|
3ee02c6275
|
feat: 添加搜索条件以排除特定用户等级
|
2024-07-01 17:54:18 +08:00 |
|
|
|
f1f609563a
|
feat: 新增采购款支付功能
|
2024-07-01 16:33:14 +08:00 |
|
|
|
a9091c03ea
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-01 11:04:20 +08:00 |
|
|
|
b63ae912bb
|
feat: 添加订单推送功能异常处理
|
2024-07-01 11:04:08 +08:00 |
|
liu
|
229725c449
|
按照比例预设退兑换券和新增兑换券
|
2024-07-01 10:47:03 +08:00 |
|
|
|
00f71306b5
|
feat(UserShipLists): 增加用户等级限制功能
|
2024-07-01 09:41:04 +08:00 |
|
liu
|
677eaf781d
|
修改回调逻辑
|
2024-07-01 09:23:37 +08:00 |
|
liu
|
82a4fddcfe
|
处理小程序新增订单商品缺失新增到缺失列表
|
2024-06-29 18:04:21 +08:00 |
|
|
|
e702f786fd
|
feat(config): 更新服务器监听地址
|
2024-06-29 17:38:18 +08:00 |
|
|
|
bf958fcf75
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 16:49:21 +08:00 |
|
|
|
2ae18e951c
|
feat: 增加支付通知功能
|
2024-06-29 16:49:16 +08:00 |
|
liu
|
01f0dab6de
|
预留余额支付兑换券逻辑
|
2024-06-29 16:13:34 +08:00 |
|
liu
|
b63052f604
|
回调日志处理
|
2024-06-29 16:10:04 +08:00 |
|
liu
|
ef7f100767
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 15:53:15 +08:00 |
|
liu
|
e813680170
|
修改取字段值
|
2024-06-29 15:53:04 +08:00 |
|
|
|
54bb838ab6
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 15:52:19 +08:00 |
|
|
|
e63582acec
|
修改兑换券逻辑和增加注释
|
2024-06-29 15:52:12 +08:00 |
|
liu
|
355b18900e
|
收银台现金支付直接加解冻礼品券
|
2024-06-29 15:41:23 +08:00 |
|
liu
|
18c660df09
|
删除多余调试
|
2024-06-29 15:32:38 +08:00 |
|
|
|
4d4772a035
|
移除VipLogic中的afterPay方法
|
2024-06-29 15:27:49 +08:00 |
|
|
|
594a31e93c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 15:14:56 +08:00 |
|
|
|
8d73511117
|
增加员工ID到财务处理逻辑
|
2024-06-29 15:14:40 +08:00 |
|
liu
|
18134f3f37
|
注释
|
2024-06-29 15:11:54 +08:00 |
|
liu
|
f96538a4b4
|
调用修复
|
2024-06-29 14:55:46 +08:00 |
|
|
|
ab018ba12d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 14:46:29 +08:00 |
|
|
|
ed983e0971
|
更新UserShip模型与相关控制器
|
2024-06-29 14:46:23 +08:00 |
|
liu
|
70920df001
|
会员下单不加兑换券
|
2024-06-29 14:40:20 +08:00 |
|
liu
|
b679ffa226
|
整合回调扣对应得礼品券已经加记录日志
|
2024-06-29 11:59:27 +08:00 |
|
liu
|
f8b3d20c49
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 11:43:45 +08:00 |
|
