From 076384bd026a7f75c87dd99f6826cd3cd980edf0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 13:24:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 3d4f0ae..8539492 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -17,7 +17,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -25,10 +27,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@@ -43,6 +42,7 @@
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
private CustomerMapper customerMapper;
/**
@@ -120,11 +120,44 @@
if (latestLedger != null) {
c.setLatestPurchaseTime(latestLedger.getExecutionDate());
}
+
+ // 璁＄畻甯歌喘浜у搧锛坱op 3锛�
+ List<SalesLedgerProduct> allProducts = new ArrayList<>();
+ for (SalesLedger ledger : salesLedgers) {
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ new QueryWrapper<SalesLedgerProduct>().lambda()
+ .eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
+ );
+ if (!CollectionUtils.isEmpty(products)) {
+ allProducts.addAll(products);
+ }
+ }
+
+ if (!CollectionUtils.isEmpty(allProducts)) {
+ // 鎸変骇鍝佺被鍒拰瑙勬牸鍨嬪彿鍒嗙粍锛岀粺璁¤喘涔版鏁�
+ Map<String, Long> productCountMap = allProducts.stream()
+ .collect(Collectors.groupingBy(
+ p -> p.getProductCategory() + "-" + p.getSpecificationModel(),
+ Collectors.counting()
+ ));
+
+ // 鎺掑簭骞跺彇鍓�3
+ List<String> topProducts = productCountMap.entrySet().stream()
+ .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
+ .limit(3)
+ .map(Map.Entry::getKey)
+ .collect(Collectors.toList());
+
+ c.setTopProducts(topProducts);
+ } else {
+ c.setTopProducts(new ArrayList<>());
+ }
} else {
// 娌℃湁閿�鍞褰曟椂璁剧疆榛樿鍊�
c.setPurchaseCount(0);
c.setAverageAmount(BigDecimal.ZERO);
c.setLatestPurchaseTime(null);
+ c.setTopProducts(new ArrayList<>());
}
})
.collect(Collectors.toList());
@@ -245,4 +278,4 @@
}
return sb.toString();
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3