|
|
3db2bda607
|
feat: 修改财务转账相关代码以优化查询效率和用户体验
|
2024-06-21 17:27:59 +08:00 |
|
|
|
20e3347b56
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 16:57:04 +08:00 |
|
|
|
ec86c3b6b7
|
feat: 优化收银台现金流水逻辑
|
2024-06-21 16:56:54 +08:00 |
|
liu
|
7a8d82a665
|
修改门店店铺商品统计逻辑
|
2024-06-21 16:21:00 +08:00 |
|
|
|
2258d11ea8
|
feat: 修改财务流水列表展示逻辑
|
2024-06-21 15:58:15 +08:00 |
|
|
|
4c001c9815
|
feat(StoreFinanceFlowLists): 根据用户类型添加财务金额符号
|
2024-06-21 15:55:56 +08:00 |
|
|
|
d2b2dbc39d
|
refactor: 修正数组索引错误
|
2024-06-21 15:45:26 +08:00 |
|
|
|
7e72bdce97
|
feat: 修改账单计算方法
|
2024-06-21 15:17:50 +08:00 |
|
|
|
216d0d5554
|
feat(StoreCashFinanceFlowLists): 添加店铺名称和管理员名称查询功能
|
2024-06-21 15:12:50 +08:00 |
|
|
|
3b166e5701
|
feat(SystemStoreStorageLists): 修改查询条件，增加状态大于等于0的记录查询
|
2024-06-21 15:05:06 +08:00 |
|
|
|
7f4decf79a
|
feat: 移除产品统计逻辑中的无效店铺名称过滤
|
2024-06-21 14:52:28 +08:00 |
|
|
|
1fb3f295ad
|
feat: 添加StoreProduct模型以获取商品信息
|
2024-06-21 14:51:35 +08:00 |
|
|
|
84a6854825
|
feat: 修改工作台控制器以处理开始时间和结束时间相等的情况
|
2024-06-21 14:48:28 +08:00 |
|
|
|
fb67788183
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 14:42:46 +08:00 |
|
|
|
5e54943d4c
|
feat: 修改了订单相关的API文档和逻辑
|
2024-06-21 14:42:36 +08:00 |
|
liu
|
51330f86fd
|
修改字段查询
|
2024-06-21 14:39:34 +08:00 |
|
liu
|
76c1a2fdff
|
新增列表字段
|
2024-06-21 14:17:09 +08:00 |
|
liu
|
957f8ba187
|
修改模型关联
|
2024-06-21 14:11:32 +08:00 |
|
|
|
2232843ad1
|
feat(StoreFinanceFlowLists): 根据用户发货状态设置财务PM值
|
2024-06-21 14:03:28 +08:00 |
|
|
|
887fe4ac26
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 14:01:43 +08:00 |
|
|
|
18f82d040f
|
feat: 修改财务流水列表功能，调整查询条件和展示内容
|
2024-06-21 14:01:39 +08:00 |
|
liu
|
80656d678b
|
反字段
|
2024-06-21 13:54:20 +08:00 |
|
|
|
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 |
|
