1252 Commits

Author SHA1 Message Date
mkm
f330790647 feat(UserController): 增加用户地址信息查询功能 2024-06-28 14:43:19 +08:00
mkm
a9bb4c25d9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 14:28:24 +08:00
mkm
660762b0a4 1 2024-06-28 14:27:48 +08:00
mkm
ee1960550d 1 2024-06-28 14:26:39 +08:00
liu
c24b0f7900 修改余额支付报错 2024-06-28 13:55:09 +08:00
mkm
0138c13069 feat: 添加系统店铺名称查询功能 2024-06-28 11:55:04 +08:00
mkm
643e1894e7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 11:44:52 +08:00
mkm
68d55fa04e feat: 修改了 StoreRefundOrderLists 和 UserRechargeLists 类以获取用户真实姓名和昵称 2024-06-28 11:44:44 +08:00
liu
95cd3876fd 采购款日志记录变化前后的金额逻辑 2024-06-28 11:29:18 +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
b5e8e527fe feat: 添加用户商品存储逻辑 2024-06-28 10:22:46 +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
4f7fea8273 gengxin执行顺序 2024-06-27 21:29:22 +08:00
liu
093e03205c 修改限制 2024-06-27 21:27:18 +08:00
liu
2619e3cdc6 修改限制查询条件 2024-06-27 21:21:42 +08:00
liu
6a7bb757d0 取消限制 2024-06-27 21:12:47 +08:00
mkm
65764cc874 feat: 修改StoreController以支持通过手机号或账户查询用户 2024-06-27 20:57:48 +08:00
mkm
750dd6aacb feat: 添加新属性user_ship到订单创建数据 2024-06-27 20:47:58 +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
liu
321f52ea95 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 20:09:13 +08:00
liu
8bc15dd181 修改 2024-06-27 20:09:03 +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
862b05496e 修改状态 2024-06-27 19:11:10 +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
liu
df67ee7699 修改礼品券核销逻辑 2024-06-27 18:59:34 +08:00
mkm
7d9f9bfb09 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 18:57:05 +08:00
mkm
2dd50089e8 feat(LoginLogic): 根据手机号判断用户是否为新用户 2024-06-27 18:56:50 +08:00
liu
b12e9b2ef6 修改语句 2024-06-27 18:51:15 +08:00
mkm
891865e98f feat: 修改购物车支付信息描述,增加句号以符合语法规范。 2024-06-27 18:38:26 +08:00
mkm
44f881d0a9 feat(CartList): 修改购物车优惠信息展示 2024-06-27 18:37:40 +08:00
mkm
69af8cfe22 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 18:34:43 +08:00
mkm
7b31bbd361 feat(CartList): 修改购物车列表功能,添加线下门店兑换礼品信息 2024-06-27 18:34:39 +08:00
liu
7d775aa4bf 修改处理回调 2024-06-27 18:34:33 +08:00
liu
a2b6431813 修改处理回调表字段 2024-06-27 18:29:34 +08:00
liu
bc6855fc7c 修改加入冻结兑换券中 2024-06-27 18:23:00 +08:00
liu
9ded85b66f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-27 18:00:15 +08:00