liu
|
aafe828da7
|
门店商品统计修改统计逻辑
|
2024-06-20 14:05:35 +08:00 |
|
liu
|
bc16d06bb6
|
修改回退商户端时间限制
|
2024-06-20 11:50:46 +08:00 |
|
liu
|
149d818157
|
修改店铺的账单记录相关统一查询逻辑
|
2024-06-19 16:21:33 +08:00 |
|
liu
|
8ac8d073f6
|
修改收银台采购款支付后调用核销逻辑
|
2024-06-19 13:52:15 +08:00 |
|
|
|
efd48e0fa7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-19 11:56:59 +08:00 |
|
|
|
204498937f
|
feat: 增加用户列表搜索字段
|
2024-06-19 11:56:47 +08:00 |
|
liu
|
5b01a6ab49
|
新增收银台查询的类型
|
2024-06-19 10:56:52 +08:00 |
|
liu
|
e200cdcd67
|
收银台支付逻辑修改
|
2024-06-18 17:33:41 +08:00 |
|
|
|
325014ee99
|
feat(user): 添加用户标签功能
|
2024-06-18 15:01:36 +08:00 |
|
liu
|
79e89fa22d
|
修改报错和查询用户余额支付
|
2024-06-18 12:10:21 +08:00 |
|
|
|
be035be2f5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 11:29:18 +08:00 |
|
|
|
4b686647c4
|
feat(StoreOrderController): 添加采购款支付处理逻辑
|
2024-06-18 11:29:08 +08:00 |
|
liu
|
c9750921f1
|
修改查询统计字段
|
2024-06-18 11:16:48 +08:00 |
|
liu
|
a546ddd353
|
修改店铺盈收统计相关的数据和收银台下单后默认为成功
|
2024-06-18 10:47:26 +08:00 |
|
|
|
ac9eb17056
|
feat(store_order): 根据支付类型和用户ID创建订单
|
2024-06-18 10:44:00 +08:00 |
|
|
|
17504629c2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 10:12:40 +08:00 |
|
|
|
a08d9ff067
|
feat: 修改用户和订单相关逻辑
|
2024-06-18 10:12:36 +08:00 |
|
liu
|
fe86e652ce
|
店铺端时间查询数据逻辑修改
|
2024-06-18 10:06:41 +08:00 |
|
|
|
7d84388fc9
|
feat: 添加查询类型字段
|
2024-06-17 18:12:26 +08:00 |
|
|
|
8d0d8ab603
|
feat: 修改支付成功返回信息，增加订单id
|
2024-06-17 18:03:23 +08:00 |
|
liu
|
4bf661fba0
|
短信校验修改
|
2024-06-17 17:37:55 +08:00 |
|
|
|
a82e96e259
|
feat: 增加用户积分查询和门店信息查询功能
|
2024-06-17 16:44:32 +08:00 |
|
|
|
6aa8964f55
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 15:56:34 +08:00 |
|
|
|
5dc332ae0a
|
feat(StoreOrderController): 优化获取成功返回结果
|
2024-06-17 15:56:26 +08:00 |
|
liu
|
3ccaee4897
|
临时大屏数据查询接口
|
2024-06-17 15:50:05 +08:00 |
|
|
|
f1d5a04b46
|
feat(store_order): 订单打印功能实现
|
2024-06-17 15:27:22 +08:00 |
|
|
|
65ecfcdcde
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 14:20:38 +08:00 |
|
|
|
b6211105c0
|
feat(store): 添加门店会员充值功能
|
2024-06-17 14:19:54 +08:00 |
|
liu
|
c3e6bdf5d0
|
新增门店收款和门店收款金额
|
2024-06-17 14:09:39 +08:00 |
|
|
|
00a72c0b71
|
feat: 添加订单核销功能
|
2024-06-17 10:22:44 +08:00 |
|
|
|
0286d428e6
|
feat: 添加门店会员充值功能
|
2024-06-17 10:02:16 +08:00 |
|
liu
|
87227e38fa
|
修改返回
|
2024-06-15 18:57:28 +08:00 |
|
liu
|
dc1fea9a15
|
充钱支付返回值修改
|
2024-06-15 18:52:20 +08:00 |
|
liu
|
1976367b3c
|
预留模板到货短信
|
2024-06-15 18:46:37 +08:00 |
|
liu
|
d04149ba48
|
更新数据字段
|
2024-06-15 18:12:07 +08:00 |
|
liu
|
bf98d4837a
|
修改回调和商品成本
|
2024-06-15 18:00:53 +08:00 |
|
liu
|
dfc7266fb0
|
补齐模型调用
|
2024-06-15 17:15:18 +08:00 |
|
|
|
fe1aecaf87
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 16:46:13 +08:00 |
|
|
|
d4c53ac69d
|
feat(order): 添加用户等级判断逻辑以调整订单总价和抵扣金额
|
2024-06-15 16:41:04 +08:00 |
|
liu
|
39173539d4
|
修改参数报错
|
2024-06-15 16:38:53 +08:00 |
|
|
|
a75b72224e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 16:07:54 +08:00 |
|
|
|
bfbd01fcc1
|
feat: 增加用户余额和购买资金字段，优化支付通知逻辑，限制充值会员不能前端设置
|
2024-06-15 16:07:50 +08:00 |
|
liu
|
8c1608207e
|
新增发送短信验证检验用户采购款够支付否
|
2024-06-15 16:06:28 +08:00 |
|
liu
|
8e82e40379
|
收银台相关验证码逻辑新增
|
2024-06-15 15:35:03 +08:00 |
|
|
|
b756c07191
|
feat: 修改用户余额字段及相关逻辑
|
2024-06-15 15:07:59 +08:00 |
|
|
|
e2c471c030
|
feat: 修改支付逻辑增加充值功能
|
2024-06-15 13:44:32 +08:00 |
|
|
|
97a7a830c3
|
feat: 增加地址API功能
|
2024-06-15 11:13:52 +08:00 |
|
|
|
177d9576c7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-15 11:00:29 +08:00 |
|
|
|
48a66a5328
|
feat(UserLists): 添加搜索功能实现ListsSearchInterface
|
2024-06-15 11:00:20 +08:00 |
|
liu
|
545e01e75a
|
新增采购款支付方式和预留用户分享逻辑
|
2024-06-15 10:49:53 +08:00 |
|
