413 Commits

Author SHA1 Message Date
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
mkm
bf958fcf75 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 16:49:21 +08:00
mkm
2ae18e951c feat: 增加支付通知功能 2024-06-29 16:49:16 +08:00
liu
4177bf71ed 修改取值参数 2024-06-29 16:36:59 +08:00
liu
af4af0d1ed 购物车逻辑兼容 2024-06-29 15:06:41 +08:00
mkm
ab018ba12d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 14:46:29 +08:00
mkm
ed983e0971 更新UserShip模型与相关控制器 2024-06-29 14:46:23 +08:00
liu
70920df001 会员下单不加兑换券 2024-06-29 14:40:20 +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
mkm
26f47a0a43 修正损耗注释,删除BackController 2024-06-29 11:41:26 +08:00
mkm
68bbf53795 feat: 修改分类列表API逻辑 2024-06-29 09:08:52 +08:00
liu
1096901067 修改回调 2024-06-28 19:08:52 +08:00
mkm
28f434f0d7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:38:19 +08:00
mkm
51df5a3a94 feat: 修改了订单核销逻辑和支付通知逻辑 2024-06-28 18:38:14 +08:00
liu
93de8124ec 返回金decimal处理 2024-06-28 18:07:51 +08:00
liu
5fdf3496f8 更新礼品券列表 2024-06-28 18:02:33 +08:00
liu
d752188d79 打开冻结款注释 2024-06-28 17:39:19 +08:00
mkm
9f3a36201d feat(user): 增加用户标签查询功能 2024-06-28 16:10:50 +08:00
mkm
eb362ad557 1 2024-06-28 15:26:59 +08:00
mkm
004ad3ccca feat: 调整分类列表API逻辑 2024-06-28 15:23:20 +08:00
mkm
4f029d5967 feat(UserController): 根据用户ID获取地址信息并添加地址别名 2024-06-28 15:10:23 +08:00
mkm
30cbd5eafe feat: 更新了用户商品存储逻辑和支付通知逻辑 2024-06-28 15:03:14 +08:00
mkm
f330790647 feat(UserController): 增加用户地址信息查询功能 2024-06-28 14:43:19 +08:00
mkm
ee1960550d 1 2024-06-28 14:26:39 +08:00
mkm
b8d086f35d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 10:22:51 +08:00
mkm
266e93f527 feat(IndexController): 添加了Push服务API功能 2024-06-28 10:20:49 +08:00
liu
41bdd754c7 注释调试会员baobei短信 2024-06-28 09:59:05 +08:00
liu
2619e3cdc6 修改限制查询条件 2024-06-27 21:21:42 +08:00
mkm
65764cc874 feat: 修改StoreController以支持通过手机号或账户查询用户 2024-06-27 20:57:48 +08:00
mkm
a54cc8adac Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 20:47:20 +08:00
mkm
195e2fa3f7 feat: 增加用户船只等级变更逻辑 2024-06-27 20:47:16 +08:00
liu
90d05227f2 充值到账礼品券逻辑 2024-06-27 20:35:06 +08:00
mkm
8cd6b63432 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 20:05:12 +08:00
mkm
f3004f2382 feat(LoginLogic): 更新用户信息API逻辑优化 2024-06-27 20:05:08 +08:00
liu
aa689ce02f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 20:05:07 +08:00
liu
69216e05cd 修改扣除逻辑 2024-06-27 20:04:58 +08:00
mkm
cba0505f63 feat: 修改登录控制器以获取更新用户信息 2024-06-27 20:03:43 +08:00
mkm
5b8d129abd Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 20:01:33 +08:00
mkm
1b1210728c feat(WechatLoginValidate): 更新用户场景不再返回手机号字段 2024-06-27 20:01:23 +08:00
liu
a6c5da49d6 修改扣除 2024-06-27 20:00:29 +08:00
liu
614c34db8e 修改逻辑 2024-06-27 19:55:56 +08:00
liu
fb03d9c2ff 核销后到账 2024-06-27 19:43:44 +08:00
liu
f64294494c 修改加入冻结礼品券 2024-06-27 19:34:08 +08:00
liu
b5a6fab3b2 修改状态 2024-06-27 19:04:10 +08:00
liu
896818edef Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 18:59:50 +08:00