From c383c8ca7053005ffa3ee58efd89956fbf52c9ea Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:34:19 +0800
Subject: [PATCH] 重构客户档案
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 75 insertions(+), 21 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 0f7b58d..959d906 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -9,35 +9,34 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
-import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
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.pojo.CustomerPrivatePool;
-import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.vo.CustomerVo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -50,22 +49,15 @@
* @date 2025-05-07
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private CustomerPrivatePoolMapper customerPrivatePoolMapper;
- @Autowired
- private CustomerMapper customerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final CustomerMapper customerMapper;
- @Autowired
- private CustomerFollowUpService customerFollowUpService;
- @Autowired
- private CustomerFollowUpFileService customerFollowUpFileService;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerFollowUpService customerFollowUpService;
+ private final CustomerReturnVisitService customerReturnVisitService;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -85,8 +77,35 @@
* @return 瀹㈡埛璇︽儏DTO
*/
@Override
- public Customer selectCustomerDetailById(Long id) {
- return this.getById( id);
+ public CustomerVo selectCustomerDetailById(Long id) {
+ CustomerVo customerVo = new CustomerVo();
+ BeanUtils.copyProperties(this.getById(id), customerVo);
+
+ // 鏌ヨ璺熻繘璁板綍
+ List<CustomerFollowUp> followUpList = customerFollowUpService.list(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .eq(CustomerFollowUp::getCustomerId, id)
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ );
+ if (!com.baomidou.mybatisplus.core.toolkit.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());
+
+ customerVo.setFollowUpList(followUpDtoList);
+ }
+
+ return customerVo;
}
/**
@@ -187,11 +206,22 @@
if (!salesLedgers.isEmpty()) {
throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
}
+ // 鏌ヨ鏄惁鏈夊凡鍒嗛厤鐨勫叕娴峰鎴�
+ List<Customer> assignedPools = customerMapper.selectList(
+ new QueryWrapper<Customer>().lambda()
+ .in(Customer::getId, idList)
+ .eq(Customer::getType, 1).
+ eq(Customer::getIsAssigned, 1) // 鍏捣瀹㈡埛
+ );
+ if (!assignedPools.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁宸插垎閰嶇殑鍏捣瀹㈡埛锛岃鍏堟敹鍥�");
+ }
// 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
for (Long id : ids) {
customerFollowUpService.deleteByCustomerId(id);
customerReturnVisitService.deleteByCustomerId(id);
}
+ customerMapper.delete(new QueryWrapper<Customer>().lambda().in(Customer::getId, idList));
return customerMapper.deleteBatchIds(idList);
}
@@ -241,6 +271,30 @@
).collect(Collectors.toList());
}
+ // 鍒嗛厤鍏捣瀹㈡埛缁欑娴�
+ @Override
+ public void assignCustomer(CustomerDto customerDto) {
+ Customer customer = customerMapper.selectById(customerDto.getId());
+ if (customer.getType() == 1 && customer.getIsAssigned() == 0) { // 鍏捣涓斿彲鍒嗛厤
+ customer.setIsAssigned(1);
+ customer.setUsageStatus(1L);
+ customer.setUsageUser(customerDto.getUsageUser());
+ customerMapper.updateById(customer);
+ }
+ }
+
+ // 鍥炴敹绉佹捣瀹㈡埛鍒板叕娴�
+ @Override
+ public void recycleCustomer(CustomerDto customerDto) {
+ Customer customer = customerMapper.selectById(customerDto.getId());
+ if (customer.getType() == 1 && customer.getIsAssigned() == 1) { // 鍏捣涓斿凡鍒嗛厤
+ customer.setIsAssigned(0);
+ customer.setUsageStatus(0L);
+ customer.setUsageUser(null);
+ customerMapper.updateById(customer);
+ }
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3