From 145f6c5c7a7a04eff490ae8436c0024850b78bc5 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 16 四月 2026 17:54:14 +0800
Subject: [PATCH] feat(customer): 新增客户跟进导出及客户转移功能
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 159 insertions(+), 12 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 07431ac..154605a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -2,27 +2,41 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.excel.CustomerExcelDTO;
import com.ruoyi.basic.mapper.CustomerMapper;
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.service.CustomerFollowUpService;
+import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
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.project.system.mapper.SysUserMapper;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
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;
@@ -36,7 +50,16 @@
@AllArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
+ private final SalesLedgerMapper salesLedgerMapper;
private CustomerMapper customerMapper;
+
+ private CustomerFollowUpService customerFollowUpService;
+
+ private CustomerFollowUpFileService customerFollowUpFileService;
+
+ private CustomerReturnVisitService customerReturnVisitService;
+
+ private SysUserMapper sysUserMapper;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -50,13 +73,57 @@
}
/**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @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;
+ }
+
+ /**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ
*/
@Override
- public IPage<Customer> selectCustomerList(Page page, Customer customer) {
+ public IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer) {
// 1. 澶勭悊绌哄�煎満鏅紙鍙傛暟鏍￠獙锛�
if (page == null) {
page = Page.of(1, 10); // 榛樿绗�1椤碉紝姣忛〉10鏉℃暟鎹�
@@ -68,9 +135,14 @@
// 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);
@@ -82,12 +154,30 @@
// 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
String address = StringUtils.defaultString(c.getCompanyAddress(), "");
String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")"); // 浼樺寲瀛楃涓叉嫾鎺�
+ 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(
+ Date.from(
+ followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
+ )
+ );
+ }
})
.collect(Collectors.toList());
// 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
- customerPage.setRecords(processedList);
+ IPage<Customer> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
+ resultPage.setRecords(processedList);
return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
}
@@ -100,9 +190,17 @@
*/
@Override
public int insertCustomer(Customer customer) {
+ // 1. 鏍￠獙瀹㈡埛鍚嶇О鏄惁宸插瓨鍦�
+ LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Customer::getCustomerName, customer.getCustomerName());
+ List<Customer> customerList = customerMapper.selectList(queryWrapper);
+ if (!customerList.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛鍚嶇О宸插瓨鍦�");
+ }
LoginUser loginUser = SecurityUtils.getLoginUser();
Long tenantId = loginUser.getTenantId();
customer.setTenantId(tenantId);
+ customer.setCreateUser(loginUser.getUserId().intValue());
return customerMapper.insert(customer);
}
@@ -114,6 +212,14 @@
*/
@Override
public int updateCustomer(Customer customer) {
+ // 1. 鏍￠獙瀹㈡埛鍚嶇О鏄惁宸插瓨鍦�
+ LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Customer::getCustomerName, customer.getCustomerName());
+ queryWrapper.ne(Customer::getId, customer.getId());
+ List<Customer> customerList = customerMapper.selectList(queryWrapper);
+ if (!customerList.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛鍚嶇О宸插瓨鍦�");
+ }
LoginUser loginUser = SecurityUtils.getLoginUser();
Long tenantId = loginUser.getTenantId();
customer.setTenantId(tenantId);
@@ -127,8 +233,19 @@
* @return 缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int deleteCustomerByIds(Long[] ids) {
List<Long> idList = Arrays.asList(ids);
+ List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new QueryWrapper<SalesLedger>().lambda().in(SalesLedger::getCustomerId, idList));
+ if (!salesLedgers.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
+ }
+ // 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
+ for (Long id : ids) {
+ customerFollowUpService.deleteByCustomerId(id);
+ customerReturnVisitService.deleteByCustomerId(id);
+ }
+
return customerMapper.deleteBatchIds(idList);
}
@@ -140,22 +257,35 @@
}
@Override
+ public List<CustomerExcelDTO> selectCustomerDtoByIds(Long[] ids) {
+ return customerMapper.selectCustomerDtoListByIds(Arrays.asList(ids));
+ }
+
+ @Override
public List<Customer> selectCustomerLists(Customer customer) {
return customerMapper.selectList(null);
}
@Override
- public Boolean importData(MultipartFile file) {
+ public List<CustomerExcelDTO> selectCustomerDtoLists() {
+ return customerMapper.selectCustomerDtoLists();
+ }
+
+ @Override
+ public AjaxResult importData(MultipartFile file) {
try {
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
List<Customer> userList = util.importExcel(file.getInputStream());
-
+ if (CollectionUtils.isEmpty(userList)) {
+ return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ }
this.saveOrUpdateBatch(userList);
- return true;
- }catch (Exception e){
+ return AjaxResult.success(true);
+ } catch (Exception e) {
e.printStackTrace();
+ return AjaxResult.error("瀵煎叆澶辫触");
}
- return false;
+
}
@Override
@@ -195,4 +325,21 @@
}
return sb.toString();
}
+
+ @Override
+ public int transferCustomer(CustomerDto customerDto) {
+ // 鏍￠獙缁存姢浜烘槸鍚﹀瓨鍦�
+ SysUser sysUser = sysUserMapper.selectUserById(customerDto.getCreateUser().longValue());
+ if (sysUser == null) {
+ throw new RuntimeException("缁存姢浜轰笉瀛樺湪");
+ }
+ // 鏍￠獙瀹㈡埛鏄惁瀛樺湪
+ Customer customer = customerMapper.selectById(customerDto.getId());
+ if (customer == null) {
+ throw new RuntimeException("瀹㈡埛涓嶅瓨鍦�");
+ }
+ customer.setMaintainer(sysUser.getNickName());
+ customer.setCreateUser(customerDto.getCreateUser());
+ return customerMapper.updateById(customer);
+ }
}
--
Gitblit v1.9.3