|
|
98cdcb682e
|
feat(WorkbenchLogic): 修改门店财务流水查询逻辑
|
2024-06-21 13:41:31 +08:00 |
|
|
|
b4a6264778
|
feat(WorkbenchLogic): 添加了门店押金金额的计算逻辑
|
2024-06-21 13:40:34 +08:00 |
|
|
|
fcfb89a066
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 13:37:45 +08:00 |
|
|
|
c99b68f65b
|
refactor: 移除了StoreOrder模型的getPayTimeAttr方法
|
2024-06-21 13:37:36 +08:00 |
|
liu
|
4662249554
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 12:00:13 +08:00 |
|
liu
|
d51f536cd6
|
修改时间判断
|
2024-06-21 12:00:03 +08:00 |
|
|
|
1040f8ca97
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 11:50:53 +08:00 |
|
|
|
a3e8ea394a
|
feat(statistic): 添加保证金金额和商品退款金额统计
|
2024-06-21 11:50:49 +08:00 |
|
liu
|
36ff55caf1
|
修改收银台下单后的返还金逻辑
|
2024-06-21 11:46:44 +08:00 |
|
|
|
7dc73909ba
|
feat: 修改交易统计逻辑以包括不同支付方式的商品交易金额
|
2024-06-21 11:46:28 +08:00 |
|
|
|
7524805421
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 11:39:21 +08:00 |
|
|
|
c06cc5a193
|
feat(statistic): 添加采购款支付商品统计
|
2024-06-21 11:39:16 +08:00 |
|
liu
|
d6ff1e62fa
|
修改校验
|
2024-06-21 11:29:51 +08:00 |
|
liu
|
36d371710c
|
用户设置支付密码,短信校验,支付校验密码
|
2024-06-21 11:23:08 +08:00 |
|
|
|
8902c720be
|
feat(TradeStatisticLogic): 根据时间键调整统计逻辑
|
2024-06-21 11:19:32 +08:00 |
|
|
|
1400d2919d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 11:18:08 +08:00 |
|
|
|
e721b96263
|
feat: 添加新的支付方式统计功能
fix: 修复商品退款金额统计错误的bug
refactor: 重构代码，优化代码结构
style: 代码风格优化，添加缺失的分号
test: 添加商品退款金额的测试
docs: 更新商品退款金额的文档说明
build: 更新项目依赖
ops: 更新部署脚本
chore: 更新项目版本
|
2024-06-21 11:18:03 +08:00 |
|
liu
|
2332ea4f29
|
拆分收银机和小程序下单扣库存逻辑
|
2024-06-21 10:24:57 +08:00 |
|
liu
|
ca711b1885
|
调整扣库存相关逻辑
|
2024-06-21 10:13:33 +08:00 |
|
liu
|
47ce687f90
|
新增返回字段
|
2024-06-21 09:51:51 +08:00 |
|
liu
|
5cadc7aaa0
|
新增厂家详情
|
2024-06-21 09:39:32 +08:00 |
|
liu
|
aeb74daca9
|
更新商品排序
|
2024-06-20 18:47:22 +08:00 |
|
liu
|
286acfaede
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 18:30:20 +08:00 |
|
liu
|
19d4d0478b
|
修改查询测试
|
2024-06-20 18:30:07 +08:00 |
|
|
|
3bdd52e460
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-20 18:13:25 +08:00 |
|
|
|
6db0b6fc47
|
feat: 添加积分记录功能并优化财务流查询
|
2024-06-20 18:13:20 +08:00 |
|
liu
|
adbfdbd618
|
起批价限制处理
|
2024-06-20 18:02:20 +08:00 |
|
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 |
|
