|
|
01ae705dbf
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-02 11:02:10 +08:00 |
|
|
|
4b849edc76
|
feat(UserController): 更新用户签到逻辑，修复积分计算错误
|
2024-07-02 11:02:00 +08:00 |
|
liu
|
e128394934
|
优化详情查询逻辑
|
2024-07-02 10:58:00 +08:00 |
|
liu
|
3c9c20e0f4
|
注释分类减少数量
|
2024-07-02 10:51:32 +08:00 |
|
liu
|
54844d161e
|
修改切换店铺的逻辑和查询的逻辑
|
2024-07-02 10:43:53 +08:00 |
|
|
|
3174d2e0ca
|
feat: 修改订单逻辑代码，删除购物车中不必要的 'id' 字段
|
2024-07-01 17:15:18 +08:00 |
|
|
|
f1f609563a
|
feat: 新增采购款支付功能
|
2024-07-01 16:33:14 +08:00 |
|
|
|
a1c3de68db
|
feat: 移除了代码中的调试语句
|
2024-07-01 15:48:10 +08:00 |
|
|
|
64d978358a
|
feat: 修改UserController和OrderLogic类以优化用户订单处理逻辑
|
2024-07-01 15:46:55 +08:00 |
|
liu
|
ba33a7b98d
|
兼容支付错误
|
2024-07-01 12:24:32 +08:00 |
|
|
|
970202fdc7
|
feat: 修改了条码支付逻辑和订单逻辑
|
2024-07-01 12:01:43 +08:00 |
|
|
|
f880a035d4
|
feat(order): 添加订单逻辑，包括创建订单、查询订单、核销订单等
|
2024-07-01 11:34:44 +08:00 |
|
liu
|
229725c449
|
按照比例预设退兑换券和新增兑换券
|
2024-07-01 10:47:03 +08:00 |
|
liu
|
6a87e58705
|
兼容店铺无商品得逻辑
|
2024-07-01 09:42:49 +08:00 |
|
|
|
bc5a7d78f5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-07-01 09:25:37 +08:00 |
|
|
|
a1504ba090
|
feat: 增加经纬度判断逻辑
|
2024-07-01 09:25:33 +08:00 |
|
liu
|
fab1cb9b3b
|
修改创建订单自提校验得逻辑方式
|
2024-07-01 09:19:25 +08:00 |
|
liu
|
82a4fddcfe
|
处理小程序新增订单商品缺失新增到缺失列表
|
2024-06-29 18:04:21 +08:00 |
|
liu
|
9d27d32f37
|
检验下单得创建逻辑
|
2024-06-29 17:31:24 +08:00 |
|
liu
|
fb7a7fe68f
|
修改参数
|
2024-06-29 16:52:03 +08:00 |
|
liu
|
04e8f6eccc
|
创建订单显示最近店铺
|
2024-06-29 16:50:24 +08:00 |
|
liu
|
4177bf71ed
|
修改取值参数
|
2024-06-29 16:36:59 +08:00 |
|
liu
|
af4af0d1ed
|
购物车逻辑兼容
|
2024-06-29 15:06:41 +08:00 |
|
|
|
ed983e0971
|
更新UserShip模型与相关控制器
|
2024-06-29 14:46:23 +08:00 |
|
liu
|
2cafc39819
|
修改查询逻辑
|
2024-06-29 13:49:48 +08:00 |
|
liu
|
b679ffa226
|
整合回调扣对应得礼品券已经加记录日志
|
2024-06-29 11:59:27 +08:00 |
|
liu
|
cd952ac019
|
冻结和解冻礼品券逻辑修改和新增
|
2024-06-29 11:43:40 +08:00 |
|
|
|
28f434f0d7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-28 18:38:19 +08:00 |
|
|
|
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 |
|
|
|
9f3a36201d
|
feat(user): 增加用户标签查询功能
|
2024-06-28 16:10:50 +08:00 |
|
liu
|
2619e3cdc6
|
修改限制查询条件
|
2024-06-27 21:21:42 +08:00 |
|
liu
|
90d05227f2
|
充值到账礼品券逻辑
|
2024-06-27 20:35:06 +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
|
69216e05cd
|
修改扣除逻辑
|
2024-06-27 20:04:58 +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 |
|
|
|
2dd50089e8
|
feat(LoginLogic): 根据手机号判断用户是否为新用户
|
2024-06-27 18:56:50 +08:00 |
|
|
|
6cb0bb359a
|
feat: 修改订单逻辑和门店财务流水逻辑以优化核销流程
|
2024-06-27 17:28:10 +08:00 |
|
|
|
fef754e25a
|
feat: 修改订单核销逻辑，增加核销后更新门店余额功能
|
2024-06-27 16:57:16 +08:00 |
|
|
|
6478f0f86e
|
feat: 修改支付逻辑以处理不同支付方式
|
2024-06-26 21:07:30 +08:00 |
|
liu
|
2c461bf4e6
|
修改校验
|
2024-06-26 19:58:06 +08:00 |
|
