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 |
|
|
|
c798b5f657
|
Merge pull request 'dev' (#24) from dev into main
Reviewed-on: #24
|
2024-06-27 21:17:17 +08:00 |
|
liu
|
6a7bb757d0
|
取消限制
|
2024-06-27 21:12:47 +08:00 |
|
|
|
65764cc874
|
feat: 修改StoreController以支持通过手机号或账户查询用户
|
2024-06-27 20:57:48 +08:00 |
|
|
|
750dd6aacb
|
feat: 添加新属性user_ship到订单创建数据
|
2024-06-27 20:47:58 +08:00 |
|
|
|
a54cc8adac
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 20:47:20 +08:00 |
|
|
|
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 |
|
|
|
8cd6b63432
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 20:05:12 +08:00 |
|
|
|
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 |
|
|
|
cba0505f63
|
feat: 修改登录控制器以获取更新用户信息
|
2024-06-27 20:03:43 +08:00 |
|
|
|
5b8d129abd
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 20:01:33 +08:00 |
|
|
|
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 |
|
|
|
7d9f9bfb09
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 18:57:05 +08:00 |
|
|
|
2dd50089e8
|
feat(LoginLogic): 根据手机号判断用户是否为新用户
|
2024-06-27 18:56:50 +08:00 |
|
liu
|
b12e9b2ef6
|
修改语句
|
2024-06-27 18:51:15 +08:00 |
|
|
|
891865e98f
|
feat: 修改购物车支付信息描述，增加句号以符合语法规范。
|
2024-06-27 18:38:26 +08:00 |
|
|
|
44f881d0a9
|
feat(CartList): 修改购物车优惠信息展示
|
2024-06-27 18:37:40 +08:00 |
|
|
|
69af8cfe22
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 18:34:43 +08:00 |
|
|
|
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 |
|
liu
|
5d2719c8f7
|
修改费活动加兑换券的逻辑
|
2024-06-27 18:00:04 +08:00 |
|
|
|
a1399e3bbd
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 17:56:54 +08:00 |
|
|
|
3e9a1e7f74
|
feat(CartList): 购物车API增加满额优惠信息
|
2024-06-27 17:56:50 +08:00 |
|
liu
|
693043303c
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 17:51:55 +08:00 |
|
liu
|
1cbb200ed2
|
处理采购款冻结
|
2024-06-27 17:51:39 +08:00 |
|
|
|
a7ba0955d9
|
feat: 增加财务逻辑保存方法
|
2024-06-27 17:43:46 +08:00 |
|
|
|
dbeaf6d96a
|
feat: 增加财务日志记录功能
|
2024-06-27 17:40:03 +08:00 |
|
|
|
6cb0bb359a
|
feat: 修改订单逻辑和门店财务流水逻辑以优化核销流程
|
2024-06-27 17:28:10 +08:00 |
|
|
|
5113989f7b
|
feat: 修改了 StoreProductLists.php 中的查询方法，使其更加灵活。
|
2024-06-27 17:13:48 +08:00 |
|
|
|
fef754e25a
|
feat: 修改订单核销逻辑，增加核销后更新门店余额功能
|
2024-06-27 16:57:16 +08:00 |
|
|
|
911c8de446
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-27 16:38:11 +08:00 |
|
|
|
6238c1d594
|
feat: 增加订单推送功能，优化充值金额限制
|
2024-06-27 16:38:00 +08:00 |
|
