From cf99945deda3cba4b0e634abb100847f5cc2529b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:36:46 +0800
Subject: [PATCH] 优化共享客户以及列表查询
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 137 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 b4b0232..c30f4f8 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -8,16 +8,19 @@
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.CustomerPrivatePool;
+import com.ruoyi.basic.pojo.*;
+import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerReturnVisitService;
+import com.ruoyi.basic.service.CustomerUserService;
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;
@@ -30,6 +33,9 @@
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;
@@ -52,6 +58,8 @@
private final CustomerFollowUpService customerFollowUpService;
private final CustomerReturnVisitService customerReturnVisitService;
+ private CustomerUserService customerUserService;
+
/**
* 鏌ヨ瀹㈡埛妗ｆ
*
@@ -70,8 +78,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;
}
/**
@@ -81,16 +116,18 @@
* @return 瀹㈡埛妗ｆ
*/
@Override
- public IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
- IPage<CustomerDto> customerPage = customerMapper.listPage(page, customer);
+ public IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long loginUserId = loginUser.getUserId();
+ IPage<CustomerVo> customerPage = customerMapper.listPage(page, customer, loginUserId);
- List<CustomerDto> records = customerPage.getRecords();
+ List<CustomerVo> records = customerPage.getRecords();
if (CollectionUtils.isEmpty(records)) {
return customerPage;
}
List<Long> customerIds = records.stream()
- .map(CustomerDto::getId)
+ .map(CustomerVo::getId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
@@ -108,6 +145,16 @@
c.setFollowUpTime(Date.from(
followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
));
+ }
+
+ // 杞崲鍏变韩鐢ㄦ埛ID瀛楃涓蹭负List<Long>
+ String userIdsStr = c.getUserIdsStr();
+ if (StringUtils.isNotEmpty(userIdsStr)) {
+ List<Long> userIds = Arrays.stream(userIdsStr.split(","))
+ .map(String::trim)
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ c.setUserIds(userIds);
}
});
}
@@ -172,15 +219,22 @@
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("瀹㈡埛妗ｆ涓嬫湁瀹㈡埛绉佹捣锛岃鍏堟敹鍥炵娴锋暟鎹�");
+ // 鏌ヨ鏄惁鏈夊凡鍒嗛厤鐨勫叕娴峰鎴�
+ 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);
}
@@ -230,6 +284,77 @@
).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
+ @Transactional(rollbackFor = Exception.class)
+ 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(0L);
+ customerMapper.updateById(customer);
+
+ // 鍒犻櫎璇ュ鎴风殑鎵�鏈夊叡浜叧绯�
+ customerUserService.remove(
+ new QueryWrapper<CustomerUser>().lambda()
+ .eq(CustomerUser::getCustomerId, customerDto.getId())
+ );
+ }
+ }
+
+ // 瀹㈡埛鍏变韩
+ @Override
+ public void together(CustomerDto customerDto) {
+ // 鏌ヨ鐜版湁鐨勫叡浜褰�
+ List<CustomerUser> existingUsers = customerUserService.list(
+ new QueryWrapper<CustomerUser>().lambda().eq(CustomerUser::getCustomerId, customerDto.getId())
+ );
+
+ // 鑾峰彇宸插瓨鍦ㄧ殑鐢ㄦ埛ID鍒楄〃
+ List<Long> existingUserIds = existingUsers.stream()
+ .map(CustomerUser::getUserId)
+ .collect(Collectors.toList());
+
+ // 杩囨护鎺夊凡瀛樺湪鐨勭敤鎴凤紝鍙繚鐣欐柊鐢ㄦ埛
+ List<Long> newUserIds = customerDto.getUserIds().stream()
+ .filter(userId -> !existingUserIds.contains(userId))
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isEmpty(newUserIds)) {
+ return;
+ }
+
+ // 鑾峰彇褰撳墠绉熸埛ID
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long tenantId = loginUser.getTenantId();
+
+ // 鎵归噺淇濆瓨鏂扮殑鍏变韩璁板綍
+ List<CustomerUser> customerUsers = newUserIds.stream()
+ .map(userId -> {
+ CustomerUser customerUser = new CustomerUser();
+ customerUser.setCustomerId(customerDto.getId());
+ customerUser.setUserId(userId);
+ customerUser.setTenantId(tenantId);
+ return customerUser;
+ })
+ .collect(Collectors.toList());
+
+ customerUserService.saveBatch(customerUsers);
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3