From 26e6eefcf5f897a5ed01a36c853d8948e0d9b48d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 22 九月 2025 10:57:19 +0800
Subject: [PATCH] 添加删除日志
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
index fa441c3..e17e964 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
@@ -196,6 +196,7 @@
.eq(TOrderSale::getShopId, query.getShopId())
.ge(TOrderSale::getOrderTime, query.getStartTime())
.le(TOrderSale::getOrderTime, query.getEndTime())
+ .eq(TOrderSale::getIsCover,1)
.eq(TOrderSale::getStatus,2));
List<Long> ids = list.stream().map(TOrderSale::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(ids)){
@@ -491,28 +492,4 @@
return this.baseMapper.getDataGeneratorSaleDetailOrderMoney(query);
}
- @Override
- public SumGeneratorClient sumExport(ProfitDetailsQuery query) {
- List<SumGeneratorDetailClient> sumGeneratorDetailClient = this.baseMapper.sumExport(query);
-
- for (SumGeneratorDetailClient generatorDetailClient : sumGeneratorDetailClient) {
- generatorDetailClient.setSingleAmount(generatorDetailClient.getActualAmount().divide(new BigDecimal(generatorDetailClient.getOrderCount()),2,BigDecimal.ROUND_DOWN));
- generatorDetailClient.setPerAmount(generatorDetailClient.getActualAmount().divide(new BigDecimal(generatorDetailClient.getPerCount()),2,BigDecimal.ROUND_DOWN));
- }
-
- SumGeneratorClient sumGeneratorClient = new SumGeneratorClient();
- sumGeneratorClient.setActualAmountSum(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getActualAmount).reduce(BigDecimal::add).get());
- sumGeneratorClient.setOrderCountSum(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getOrderCount).reduce(Integer::sum).get());
- sumGeneratorClient.setSingleAmountSum(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getSingleAmount).reduce(BigDecimal::add).get());
- sumGeneratorClient.setPerCountSum(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getPerCount).reduce(Integer::sum).get());
- sumGeneratorClient.setPerAmountSum(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getPerAmount).reduce(BigDecimal::add).get());
-
- sumGeneratorClient.setAllMoney(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getActualAmount).reduce(BigDecimal::add).get());
- sumGeneratorClient.setSingleAvgAmount(sumGeneratorClient.getAllMoney().divide(new BigDecimal(sumGeneratorClient.getPerCountSum())));
- sumGeneratorClient.setPerCapitaAmount(sumGeneratorClient.getAllMoney().divide(new BigDecimal(sumGeneratorClient.getOrderCountSum())));
-
- sumGeneratorClient.setOrderStatistics(sumGeneratorDetailClient);
-
- return sumGeneratorClient;
- }
}
--
Gitblit v1.7.1