From b20832bdb2ed7f7e8ae8a7070580adc65760a9d0 Mon Sep 17 00:00:00 2001
From: spllzh <28668817@qq.com>
Date: Thu, 14 Aug 2025 20:42:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E8=A7=A3=E5=86=B3=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E7=BC=96=E8=BE=91=20?=
 =?UTF-8?q?=E3=80=81=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerManagementController.java         | 59 ++++++++++++++++++-
 .../controller/SalesManagementController.java |  1 +
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/rj/controller/CustomerManagementController.java b/src/main/java/com/rj/controller/CustomerManagementController.java
index 174fc76..69242c0 100644
--- a/src/main/java/com/rj/controller/CustomerManagementController.java
+++ b/src/main/java/com/rj/controller/CustomerManagementController.java
@@ -3,7 +3,11 @@ package com.rj.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rj.entity.CustomerManagement;
+import com.rj.entity.Dealership;
+import com.rj.entity.SalesManagement;
 import com.rj.service.ICustomerManagementService;
+import com.rj.service.IDealershipService;
+import com.rj.service.ISalesManagementService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,6 +19,8 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -115,6 +121,11 @@ public class CustomerManagementController {
         }
     }
 
+    @Autowired
+    private IDealershipService dealershipService;
+    @Autowired
+    private ISalesManagementService salesManagementService;
+
     /**
      * 分页查询客户列表
      */
@@ -148,10 +159,54 @@ public class CustomerManagementController {
             }
             
             // 按创建时间倒序排列
-            queryWrapper.orderByDesc(CustomerManagement::getCreateTime);
+            queryWrapper.orderByDesc(CustomerManagement::getUpdateTime);
             
             Page<CustomerManagement> customerPage = customerManagementService.page(page, queryWrapper);
-            
+
+            List<String> dealershipIds = customerPage.getRecords().stream()
+                    .map(CustomerManagement::getDealershipId)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .collect(Collectors.toList());
+
+            List<String> saleIds = customerPage.getRecords().stream()
+                    .map(CustomerManagement::getSalesId)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .collect(Collectors.toList());
+
+
+            // 批量获取门店信息
+            Map<String, String> dealershipNameMap;
+            if (!dealershipIds.isEmpty()) {
+                LambdaQueryWrapper<Dealership> dealershipQueryWrapper = new LambdaQueryWrapper<>();
+                dealershipQueryWrapper.in(Dealership::getId, dealershipIds);
+                List<Dealership> dealerships = dealershipService.list(dealershipQueryWrapper);
+                dealershipNameMap = dealerships.stream()
+                        .collect(Collectors.toMap(Dealership::getId, Dealership::getDealershipName));
+            } else {
+                dealershipNameMap = new HashMap<>();
+            }
+
+            // 批量获取 销售信息
+            Map<String, String> saleNameMap;
+            if (!saleIds.isEmpty()) {
+                LambdaQueryWrapper<SalesManagement> salesQueryWrapper = new LambdaQueryWrapper<>();
+                salesQueryWrapper.in(SalesManagement::getId, saleIds);
+                List<SalesManagement> sales = salesManagementService.list(salesQueryWrapper);
+                saleNameMap = sales.stream()
+                        .collect(Collectors.toMap(SalesManagement::getId, SalesManagement::getSalesName));
+            } else {
+                saleNameMap = new HashMap<>();
+            }
+
+
+            customerPage.getRecords().forEach(customer -> {
+                customer.setDealershipName(dealershipNameMap.get(customer.getDealershipId()));
+                customer.setSalesName(saleNameMap.get(customer.getSalesId()));
+            });
+
+
             result.put("success", true);
             result.put("message", "查询成功");
             result.put("data", customerPage.getRecords());
diff --git a/src/main/java/com/rj/controller/SalesManagementController.java b/src/main/java/com/rj/controller/SalesManagementController.java
index 79036fc..92f41e6 100644
--- a/src/main/java/com/rj/controller/SalesManagementController.java
+++ b/src/main/java/com/rj/controller/SalesManagementController.java
@@ -315,6 +315,7 @@ public class SalesManagementController {
             }
             
             boolean success = salesManagementService.removeByIds(ids);
+            result.put("data", "删除");
             if (success) {
                 result.put("success", true);
                 result.put("message", "批量删除成功，共删除 " + ids.size() + " 条记录");