From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 157 +++++++++++++++++++---------------------------------
1 files changed, 58 insertions(+), 99 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 b7cb426..b4b0232 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -8,12 +8,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CustomerDto;
-import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.mapper.CustomerMapper;
+import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.CustomerFollowUp;
-import com.ruoyi.basic.pojo.CustomerFollowUpFile;
-import com.ruoyi.basic.service.CustomerFollowUpFileService;
+import com.ruoyi.basic.pojo.CustomerPrivatePool;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.basic.service.ICustomerService;
@@ -22,21 +21,17 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.ZoneId;
+import java.util.*;
import java.util.stream.Collectors;
@@ -47,17 +42,15 @@
* @date 2025-05-07
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
private final SalesLedgerMapper salesLedgerMapper;
- private CustomerMapper customerMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final CustomerMapper customerMapper;
- private CustomerFollowUpService customerFollowUpService;
-
- private CustomerFollowUpFileService customerFollowUpFileService;
-
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerFollowUpService customerFollowUpService;
+ private final CustomerReturnVisitService customerReturnVisitService;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -77,41 +70,8 @@
* @return 瀹㈡埛璇︽儏DTO
*/
@Override
- public CustomerDto selectCustomerDetailById(Long id) {
- Customer customer = customerMapper.selectById(id);
- if (customer == null) {
- return null;
- }
-
- CustomerDto dto = new CustomerDto();
- BeanUtils.copyProperties(customer, dto);
-
- // 鏌ヨ璺熻繘璁板綍
- List<CustomerFollowUp> followUpList = customerFollowUpService.list(
- new LambdaQueryWrapper<CustomerFollowUp>()
- .eq(CustomerFollowUp::getCustomerId, id)
- .orderByDesc(CustomerFollowUp::getFollowUpTime)
- );
-
- if (!CollectionUtils.isEmpty(followUpList)) {
- List<CustomerFollowUpDto> followUpDtoList = followUpList.stream().map(followUp -> {
- CustomerFollowUpDto followUpDto = new CustomerFollowUpDto();
- BeanUtils.copyProperties(followUp, followUpDto);
-
- // 鏌ヨ闄勪欢
- List<CustomerFollowUpFile> fileList = customerFollowUpFileService.list(
- new LambdaQueryWrapper<CustomerFollowUpFile>()
- .eq(CustomerFollowUpFile::getFollowUpId, followUp.getId())
- );
- followUpDto.setFileList(fileList);
-
- return followUpDto;
- }).collect(Collectors.toList());
-
- dto.setFollowUpList(followUpDtoList);
- }
-
- return dto;
+ public Customer selectCustomerDetailById(Long id) {
+ return this.getById( id);
}
/**
@@ -121,58 +81,53 @@
* @return 瀹㈡埛妗ｆ
*/
@Override
- public IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer) {
- // 1. 澶勭悊绌哄�煎満鏅紙鍙傛暟鏍￠獙锛�
- if (page == null) {
- page = Page.of(1, 10); // 榛樿绗�1椤碉紝姣忛〉10鏉℃暟鎹�
- }
- if (customer == null) {
- customer = new Customer(); // 閬垮厤绌哄璞″鑷寸殑NPE
+ public IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
+ IPage<CustomerDto> customerPage = customerMapper.listPage(page, customer);
+
+ List<CustomerDto> records = customerPage.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ return customerPage;
}
- // 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
- LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
- String customerName = customer.getCustomerName();
- String customerType = customer.getCustomerType();
- if (StringUtils.isNotBlank(customerName)) {
- queryWrapper.like(Customer::getCustomerName, customerName);
- }
- if (StringUtils.isNotBlank(customerType)) {
- queryWrapper.like(Customer::getCustomerType, customerType);
- }
-
- // 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
- IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);
-
- // 4. 鏁版嵁澶勭悊锛堝寮虹┖鍊煎畨鍏� & 浠ｇ爜鍙鎬э級
- List<Customer> processedList = customerPage.getRecords().stream()
- .filter(Objects::nonNull) // 杩囨护绌哄璞★紙閬垮厤鍚庣画鎿嶄綔NPE锛�
- .peek(c -> {
- // 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
- String address = StringUtils.defaultString(c.getCompanyAddress(), "");
- String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")");
-
- // 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
- CustomerFollowUp followUp = customerFollowUpService.getOne(
- new LambdaQueryWrapper<CustomerFollowUp>()
- .eq(CustomerFollowUp::getCustomerId, c.getId())
- .orderByDesc(CustomerFollowUp::getFollowUpTime)
- .last("LIMIT 1")
- );
-
- if (followUp != null) {
- c.setFollowUpLevel(followUp.getFollowUpLevel());
- c.setFollowUpTime(followUp.getFollowUpTime());
- }
- })
+ List<Long> customerIds = records.stream()
+ .map(CustomerDto::getId)
+ .filter(Objects::nonNull)
.collect(Collectors.toList());
- // 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
- IPage<Customer> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
- resultPage.setRecords(processedList);
+ if (!CollectionUtils.isEmpty(customerIds)) {
+ Map<Long, CustomerFollowUp> latestFollowUpMap = getLatestFollowUpMap(customerIds);
- return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
+ records.forEach(c -> {
+ String address = StringUtils.defaultString(c.getCompanyAddress(), "");
+ String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
+ c.setAddressPhone(address + "(" + phone + ")");
+
+ CustomerFollowUp followUp = latestFollowUpMap.get(c.getId());
+ if (followUp != null) {
+ c.setFollowUpLevel(followUp.getFollowUpLevel());
+ c.setFollowUpTime(Date.from(
+ followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
+ ));
+ }
+ });
+ }
+
+ return customerPage;
+ }
+
+ private Map<Long, CustomerFollowUp> getLatestFollowUpMap(List<Long> customerIds) {
+ List<CustomerFollowUp> followUps = customerFollowUpService.list(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .in(CustomerFollowUp::getCustomerPrivatePoolId, customerIds)
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ );
+
+ return followUps.stream()
+ .collect(Collectors.toMap(
+ CustomerFollowUp::getCustomerPrivatePoolId,
+ followUp -> followUp,
+ (existing, replacement) -> existing
+ ));
}
/**
@@ -217,6 +172,10 @@
if (!salesLedgers.isEmpty()) {
throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
}
+ List<CustomerPrivatePool> customerPrivatePools = customerPrivatePoolMapper.selectList(new QueryWrapper<CustomerPrivatePool>().lambda().in(CustomerPrivatePool::getCustomerId, idList));
+ if (!customerPrivatePools.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁瀹㈡埛绉佹捣锛岃鍏堟敹鍥炵娴锋暟鎹�");
+ }
// 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
for (Long id : ids) {
customerFollowUpService.deleteByCustomerId(id);
--
Gitblit v1.9.3