381 Commits

Author SHA1 Message Date
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
liu
df67ee7699 修改礼品券核销逻辑 2024-06-27 18:59:34 +08:00
mkm
2dd50089e8 feat(LoginLogic): 根据手机号判断用户是否为新用户 2024-06-27 18:56:50 +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
7b31bbd361 feat(CartList): 修改购物车列表功能,添加线下门店兑换礼品信息 2024-06-27 18:34:39 +08:00
mkm
3e9a1e7f74 feat(CartList): 购物车API增加满额优惠信息 2024-06-27 17:56:50 +08:00
mkm
6cb0bb359a feat: 修改订单逻辑和门店财务流水逻辑以优化核销流程 2024-06-27 17:28:10 +08:00
mkm
fef754e25a feat: 修改订单核销逻辑,增加核销后更新门店余额功能 2024-06-27 16:57:16 +08:00
mkm
6238c1d594 feat: 增加订单推送功能,优化充值金额限制 2024-06-27 16:38:00 +08:00
liu
b95964cbaf 小程序分类修改表存储逻辑相关 2024-06-27 15:26:34 +08:00
mkm
72c64d29d9 feat: 修改了商店控制器以从参数中获取价格 2024-06-27 14:26:39 +08:00
mkm
194db4c3df feat: 更新用户等级和余额核销逻辑 2024-06-27 14:21:02 +08:00
mkm
b812b36e3e feat: 修改了StoreProductLists.php, LoginLogic.php, OperationLogMiddleware.php, IndexController.php, OrderEnum.php, CommissionLogic.php, StoreFinanceFlowLogic.php, StoreOrderController.php, middleware.php等文件 2024-06-27 13:46:42 +08:00
mkm
6478f0f86e feat: 修改支付逻辑以处理不同支付方式 2024-06-26 21:07:30 +08:00
liu
2c461bf4e6 修改校验 2024-06-26 19:58:06 +08:00
mkm
55c72dcd4d feat: 新增用户标签和 Shipping 信息功能 2024-06-26 19:41:27 +08:00
mkm
525fa7292f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 18:55:25 +08:00
mkm
130e736cae Merge remote-tracking branch 'origin/main' into dev 2024-06-26 18:55:12 +08:00
liu
9a0cd3bd4c 保留2位小数 2024-06-26 18:37:37 +08:00
liu
c5a21a867b 限制小程序查询数据 2024-06-26 18:32:27 +08:00
liu
eb0aa5b6fc 修改报错返回格式 2024-06-26 18:27:36 +08:00
liu
9cd1395a0a 新增报错提示 2024-06-26 18:07:37 +08:00
mkm
9346c581b3 feat: 实现线下分润逻辑 2024-06-26 17:55:46 +08:00
liu
9d54b4dea1 增加采购款 余额支付冻结礼品券逻辑 2024-06-26 17:07:56 +08:00
mkm
dba7e7ec8c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 16:50:40 +08:00
mkm
6cfc2c773e feat(order): 修改订单逻辑以处理用户信息变更 2024-06-26 16:50:35 +08:00
liu
fdddbbec51 测试短信调用 2024-06-26 16:38:04 +08:00
mkm
6c34f028a2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-26 15:51:11 +08:00
mkm
4f2e432d10 feat(order): 修改订单逻辑,统一计算价格字段 2024-06-26 15:51:00 +08:00
liu
379c8aea4c 切换冻结相关得值返回 2024-06-26 15:47:03 +08:00
liu
bfb85eecd1 切换冻结相关得值返回 2024-06-26 15:44:14 +08:00
liu
3f7d500347 处理价格按照订单下单价格展示 2024-06-26 15:41:01 +08:00