|
|
e702f786fd
|
feat(config): 更新服务器监听地址
|
2024-06-29 17:38:18 +08:00 |
|
liu
|
9d27d32f37
|
检验下单得创建逻辑
|
2024-06-29 17:31:24 +08:00 |
|
|
|
f3089c4277
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 17:17:01 +08:00 |
|
|
|
9ac84ac72f
|
feat: 创建用户商品存储列表类UserProductStorageLists
|
2024-06-29 17:16:56 +08:00 |
|
liu
|
fb7a7fe68f
|
修改参数
|
2024-06-29 16:52:03 +08:00 |
|
liu
|
a4b07bc878
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 16:50:50 +08:00 |
|
liu
|
04e8f6eccc
|
创建订单显示最近店铺
|
2024-06-29 16:50:24 +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
|
4177bf71ed
|
修改取值参数
|
2024-06-29 16:36:59 +08:00 |
|
liu
|
1761d038b4
|
订单商家展示
|
2024-06-29 16:19:45 +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
|
1e1b176f7b
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 15:07:06 +08:00 |
|
liu
|
af4af0d1ed
|
购物车逻辑兼容
|
2024-06-29 15:06:41 +08:00 |
|
|
|
7064c67262
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 14:56:33 +08:00 |
|
|
|
a4fdbc5256
|
调整用户会员类型管理控制器
|
2024-06-29 14:56:22 +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
|
f7f60c47d9
|
注释验证码
|
2024-06-29 14:45:39 +08:00 |
|
liu
|
70920df001
|
会员下单不加兑换券
|
2024-06-29 14:40:20 +08:00 |
|
|
|
61f7ce9332
|
修改礼品券统计描述与逻辑
|
2024-06-29 14:14:01 +08:00 |
|
|
|
d4eef002fe
|
禁用商品退款金额统计
|
2024-06-29 14:00:55 +08:00 |
|
|
|
085ad190fc
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-29 13:52:52 +08:00 |
|
|
|
e975c3e28e
|
修改退款充值状态筛选逻辑
|
2024-06-29 13:52:42 +08:00 |
|
liu
|
2cafc39819
|
修改查询逻辑
|
2024-06-29 13:49:48 +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 |
|
liu
|
cd952ac019
|
冻结和解冻礼品券逻辑修改和新增
|
2024-06-29 11:43:40 +08:00 |
|
|
|
26f47a0a43
|
修正损耗注释，删除BackController
|
2024-06-29 11:41:26 +08:00 |
|
|
|
090955158f
|
优化分润逻辑与财务流水处理
|
2024-06-29 10:19:08 +08:00 |
|
|
|
277b7b3836
|
Merge pull request '处理后台报错' (#28) from dev into main
Reviewed-on: #28
|
2024-06-29 09:35:33 +08:00 |
|
liu
|
cf0ac14419
|
处理后台报错
|
2024-06-29 09:24:57 +08:00 |
|
|
|
7e5fdb9d22
|
Merge pull request 'feat: 修改分类列表API逻辑' (#27) from dev into main
Reviewed-on: #27
|
2024-06-29 09:09:20 +08:00 |
|
|
|
68bbf53795
|
feat: 修改分类列表API逻辑
|
2024-06-29 09:08:52 +08:00 |
|
|
|
7036f065b3
|
Merge pull request 'dev' (#26) from dev into main
Reviewed-on: #26
|
2024-06-28 19:12:32 +08:00 |
|
|
|
fc3b6750eb
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-28 19:11:07 +08:00 |
|
|
|
919229c8dc
|
feat: 修改核销码查询逻辑
|
2024-06-28 19:10:56 +08:00 |
|
liu
|
1096901067
|
修改回调
|
2024-06-28 19:08:52 +08:00 |
|
