liu
|
1a952e4c57
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 17:45:49 +08:00 |
|
liu
|
9e30337399
|
修改商品统计代码
|
2024-06-20 17:45:36 +08:00 |
|
|
|
a4d6931ba4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 17:43:55 +08:00 |
|
|
|
a8e0cd003a
|
feat(system_store_storage): 添加根据状态查询入库记录功能
|
2024-06-20 17:43:51 +08:00 |
|
liu
|
a614fea407
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 17:36:03 +08:00 |
|
liu
|
d61932c7fd
|
返回字段
|
2024-06-20 17:35:52 +08:00 |
|
|
|
f2a136b5dd
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 17:34:56 +08:00 |
|
|
|
1c524f97b9
|
feat: 增加平台手续费收入记录
|
2024-06-20 17:34:51 +08:00 |
|
liu
|
7d56ff9fbd
|
收银机下单金额处理
|
2024-06-20 17:32:31 +08:00 |
|
liu
|
36d1131c3e
|
处理支付成功后通用商品统计逻辑
|
2024-06-20 17:30:23 +08:00 |
|
|
|
eb57117246
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 17:28:00 +08:00 |
|
|
|
8fadc9fdd7
|
feat(OrderEnum): 修改订单枚举类型中的支付方式描述
|
2024-06-20 17:27:50 +08:00 |
|
liu
|
3ab512f49d
|
加入购物车附加商品统计表
|
2024-06-20 16:35:33 +08:00 |
|
liu
|
85a8d1809f
|
限制最低付款金额
|
2024-06-20 15:55:41 +08:00 |
|
liu
|
6b29a32470
|
注释数量限制
|
2024-06-20 15:54:01 +08:00 |
|
liu
|
6170e98fec
|
修改余额支付的标识和查询的相关数据修改
|
2024-06-20 15:37:53 +08:00 |
|
|
|
0dc94531a5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 14:45:29 +08:00 |
|
|
|
b8038b820a
|
feat(TradeStatisticLogic): 修改TradeStatisticLogic，优化本月支付人数曲线查询
|
2024-06-20 14:45:24 +08:00 |
|
liu
|
1051e0c7a9
|
修改门店商品排行相关的查询逻辑
|
2024-06-20 14:41:04 +08:00 |
|
|
|
24fd63e880
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 14:37:11 +08:00 |
|
|
|
67532a536a
|
feat: 重构了订单相关的统计逻辑和代码结构
|
2024-06-20 14:37:06 +08:00 |
|
liu
|
69cce893c6
|
小程序新增返回价格相关
|
2024-06-20 14:34:13 +08:00 |
|
|
|
140fe814c2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 14:19:18 +08:00 |
|
|
|
13a5b9bb0e
|
feat: 添加工作台功能和门店统计页面
|
2024-06-20 14:19:09 +08:00 |
|
liu
|
aafe828da7
|
门店商品统计修改统计逻辑
|
2024-06-20 14:05:35 +08:00 |
|
liu
|
304f5fddce
|
修改返回参数
|
2024-06-20 13:46:20 +08:00 |
|
liu
|
4e6c195d43
|
修改校验
|
2024-06-20 13:44:11 +08:00 |
|
liu
|
5df4f2d569
|
修改校验
|
2024-06-20 13:39:29 +08:00 |
|
liu
|
bc16d06bb6
|
修改回退商户端时间限制
|
2024-06-20 11:50:46 +08:00 |
|
liu
|
5e9a77d38c
|
更新限制
|
2024-06-20 11:44:16 +08:00 |
|
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 |
|
