liu
|
6cbffc01a8
|
新增店铺明细查询数据
|
2024-06-20 11:41:14 +08:00 |
|
|
|
4339cf481e
|
feat: 修改交易统计逻辑以支持按日期查询
|
2024-06-20 11:27:14 +08:00 |
|
|
|
283e8f1747
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 11:08:43 +08:00 |
|
|
|
557170ce74
|
feat: 修改了交易统计逻辑，添加了交易统计的接口
|
2024-06-20 11:08:06 +08:00 |
|
liu
|
947b0a72fb
|
用户后台新增相关数据
|
2024-06-20 10:09:15 +08:00 |
|
|
|
2aa8322f99
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-19 19:02:27 +08:00 |
|
|
|
9050f2c745
|
feat(trade): 添加了交易模块的API功能
|
2024-06-19 19:02:14 +08:00 |
|
liu
|
8e957d7d86
|
修改分类搜索限制
|
2024-06-19 18:44:45 +08:00 |
|
|
|
8fe86d5bd9
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-19 17:40:53 +08:00 |
|
|
|
7e4b4951e8
|
feat: 修改了商品列表API的查询逻辑
|
2024-06-19 17:40:41 +08:00 |
|
liu
|
69ed8b332d
|
注释分类相关逻辑待修改
|
2024-06-19 17:05:37 +08:00 |
|
liu
|
7981e126f3
|
修改收银机分类逻辑相关
|
2024-06-19 16:58:38 +08:00 |
|
liu
|
149d818157
|
修改店铺的账单记录相关统一查询逻辑
|
2024-06-19 16:21:33 +08:00 |
|
liu
|
14d0f838fd
|
新增订单为会员等级1标识
|
2024-06-19 14:19:44 +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
|
4112b6ffe3
|
修改用户类型收银展示的值
|
2024-06-19 11:23:54 +08:00 |
|
liu
|
5b01a6ab49
|
新增收银台查询的类型
|
2024-06-19 10:56:52 +08:00 |
|
liu
|
17a6b57673
|
更新修改分润逻辑只有会员按照采购款逻辑拆分,其余的分润还是按照正常的支付金额
|
2024-06-19 10:24:11 +08:00 |
|
liu
|
b1e1e39164
|
修改分享后用户的使用的支付金额
|
2024-06-19 10:07:26 +08:00 |
|
|
|
97a6102b20
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-19 09:39:52 +08:00 |
|
|
|
d0b0dbb3b3
|
feat: 添加返回标题功能
|
2024-06-19 09:39:48 +08:00 |
|
liu
|
f27eb18340
|
取消多扣费一次
|
2024-06-18 19:06:24 +08:00 |
|
liu
|
2e64e57488
|
修改余额支付逻辑
|
2024-06-18 18:38:42 +08:00 |
|
liu
|
ea4e67a38f
|
修改店铺支付逻辑和回调处理逻辑
|
2024-06-18 18:25:08 +08:00 |
|
|
|
d4ee97c5ad
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 18:17:44 +08:00 |
|
|
|
3a789a3726
|
feat(IndexController): 添加系统商店功能
|
2024-06-18 18:17:39 +08:00 |
|
liu
|
2386f496bd
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 18:15:23 +08:00 |
|
liu
|
a9e418ba8d
|
修改用户为vip1的时候的逻辑
|
2024-06-18 18:15:17 +08:00 |
|
|
|
17706c1f98
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 18:14:35 +08:00 |
|
|
|
e210bb7906
|
feat(WorkbenchController): 修改本月订单数和本月支付人数的统计方式
|
2024-06-18 18:14:25 +08:00 |
|
liu
|
e200cdcd67
|
收银台支付逻辑修改
|
2024-06-18 17:33:41 +08:00 |
|
liu
|
f00ca73aa9
|
最近店铺修改逻辑
|
2024-06-18 17:27:36 +08:00 |
|
liu
|
479de5cc41
|
修改新版本扣除金额逻辑
|
2024-06-18 16:57:10 +08:00 |
|
liu
|
b23cafcb64
|
修改会员为1时情况下处理金额为支付金额减去冻结金额逻辑
|
2024-06-18 16:18:12 +08:00 |
|
liu
|
17239d39e8
|
迁移vip为1得时候得冻结金额和修改用户查询得带返回冻结金额
|
2024-06-18 15:27:42 +08:00 |
|
|
|
325014ee99
|
feat(user): 添加用户标签功能
|
2024-06-18 15:01:36 +08:00 |
|
liu
|
79e89fa22d
|
修改报错和查询用户余额支付
|
2024-06-18 12:10:21 +08:00 |
|
liu
|
b67259a91e
|
更新修改用户余额支付日志流水记录逻辑修改
|
2024-06-18 11:49:53 +08:00 |
|
|
|
84d056bfaf
|
feat: 修改支付通知逻辑以增加积分
|
2024-06-18 11:45:09 +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 |
|
|
|
b5b364a3d1
|
feat: 修改PayNotifyLogic类以正确计算用户利润
|
2024-06-18 10:46:18 +08:00 |
|
|
|
ac9eb17056
|
feat(store_order): 根据支付类型和用户ID创建订单
|
2024-06-18 10:44:00 +08:00 |
|
|
|
7cf5379755
|
feat: 新增采购款收银支付方式
|
2024-06-18 10:18:01 +08:00 |
|
|
|
1c6cb9b1a5
|
refactor(PayNotifyLogic): 移除支付类型为9的订单处理逻辑
|
2024-06-18 10:16:02 +08:00 |
|
|
|
17504629c2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 10:12:40 +08:00 |
|
