|
|
2a95eb8e1f
|
feat: 修改了交易统计逻辑，移除了不必要的余额支付计算，并调整了线下收款和总交易额的计算方式。
|
2024-06-22 11:19:56 +08:00 |
|
|
|
22579a624a
|
feat(WorkbenchLogic): 修改订单列表查询限制从10到6
|
2024-06-22 11:16:27 +08:00 |
|
|
|
d7774568ac
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-22 11:12:49 +08:00 |
|
|
|
ff65d32a80
|
feat: 添加了两个新的模型类 StoreOrderTransshipment 和 StoreOrderTransshipmentInfo
|
2024-06-22 11:12:39 +08:00 |
|
liu
|
4d87e7f3fd
|
注释限制金额调试
|
2024-06-22 11:07:20 +08:00 |
|
liu
|
8045c84b1c
|
修改字段
|
2024-06-22 11:05:18 +08:00 |
|
liu
|
1e88e5deed
|
处理收银台数量统计
|
2024-06-22 10:52:31 +08:00 |
|
liu
|
d4db924410
|
注释校验
|
2024-06-22 10:21:52 +08:00 |
|
|
|
d5255e38bb
|
feat: 修改门店收款金额计算逻辑
|
2024-06-22 10:09:14 +08:00 |
|
|
|
ccdbb687a5
|
feat: 修改了WorkbenchLogic逻辑，优化了代码结构，统一了查询条件，并调整了部分方法的参数。
|
2024-06-22 10:07:28 +08:00 |
|
|
|
e25fe49941
|
feat: 修改统计逻辑以计算总金额
|
2024-06-22 09:47:11 +08:00 |
|
|
|
f2c9bbdb7b
|
refactor(TradeStatisticLogic): 移除不必要的变量赋值
|
2024-06-21 18:16:21 +08:00 |
|
|
|
28a56119d4
|
refactor: 移除支出金额计算代码
|
2024-06-21 18:11:01 +08:00 |
|
|
|
dfa2c4d83b
|
feat(TradeStatisticLogic): 修改现金金额描述为现金收银金额
|
2024-06-21 18:08:01 +08:00 |
|
|
|
2bec4ba97c
|
feat(ProductStatisticLogic): 修改商品统计逻辑并优化查询性能
|
2024-06-21 18:05:28 +08:00 |
|
|
|
3c0848a4e4
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-21 17:28:12 +08:00 |
|
|
|
3db2bda607
|
feat: 修改财务转账相关代码以优化查询效率和用户体验
|
2024-06-21 17:27:59 +08:00 |
|
liu
|
8b58c71282
|
修改现金收银结算方式取消现金收银的冻结逻辑
|
2024-06-21 17:18:43 +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 |
|
