From 5fca9c4f75933fd4ea8c517bf6b1acc6a9f3d654 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 13:52:56 +0800
Subject: [PATCH] 质量增加日志
---
src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
index 010dec0..22b9b66 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.SalesTrendDto;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
@@ -11,8 +11,8 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -25,20 +25,16 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class MetricStatisticsServiceImpl {
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final ShippingInfoMapper shippingInfoMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
-
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
-
- public AjaxResult total() {
+ public R<?> total() {
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
- if(CollectionUtils.isEmpty(salesLedgers)) return AjaxResult.success(salesLedgers);
+ if(CollectionUtils.isEmpty(salesLedgers)) return R.ok(salesLedgers);
Map<String, Object> map = new HashMap<>();
// 閿�鍞
map.put("contractAmountTotal", salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -48,16 +44,16 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
.eq(SalesLedgerProduct::getType, 1));
map.put("shipRate", "0%");
- if(CollectionUtils.isEmpty(salesLedgerProducts)) return AjaxResult.success(map);
+ if(CollectionUtils.isEmpty(salesLedgerProducts)) return R.ok(map);
// 鍙戣揣鏁伴噺
long count = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>()
.in(ShippingInfo::getSalesLedgerProductId, salesLedgerProducts.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList()))
.eq(ShippingInfo::getStatus,"宸插彂璐�"));
map.put("shipRate", String.format("%.2f", count * 100.0 / salesLedgerProducts.size()) + "%");
- return AjaxResult.success(map);
+ return R.ok(map);
}
- public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
+ public R<?> statisticsTable(StatisticsTableDto statisticsTableDto) {
Map<String, Object> map = new HashMap<>();
Calendar calendar = Calendar.getInstance();
@@ -127,6 +123,6 @@
map.put("orderCountList", orderCountList);
map.put("salesAmountList", salesAmountList);
map.put("shippingRateList", shippingRateList);
- return AjaxResult.success(map);
+ return R.ok(map);
}
}
--
Gitblit v1.9.3