From 971d450e8627d7d8116c741a0306cce05ad5f57c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 五月 2026 14:46:01 +0800
Subject: [PATCH] fix(customer): 修复客户分配逻辑
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 473 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 455 insertions(+), 18 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 441e94d..cb80642 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,14 +1,39 @@
package com.ruoyi.basic.service.impl;
+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.CustomerContactDto;
+import com.ruoyi.basic.dto.CustomerDto;
+import com.ruoyi.basic.dto.CustomerFollowUpDto;
+import com.ruoyi.basic.mapper.CustomerContactMapper;
import com.ruoyi.basic.mapper.CustomerMapper;
-import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.pojo.*;
+import com.ruoyi.basic.service.*;
+import com.ruoyi.basic.vo.CustomerVo;
+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.R;
+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.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.util.List;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -19,8 +44,23 @@
*/
@Service
@AllArgsConstructor
+@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
private CustomerMapper customerMapper;
+
+ @Autowired
+ private CustomerFollowUpService customerFollowUpService;
+ @Autowired
+ private CustomerFollowUpFileService customerFollowUpFileService;
+ @Autowired
+ private CustomerReturnVisitService customerReturnVisitService;
+ @Autowired
+ private CustomerUserService customerUserService;
+ @Autowired
+ private CustomerContactMapper customerContactMapper;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -30,7 +70,58 @@
*/
@Override
public Customer selectCustomerById(Long id) {
- return customerMapper.selectCustomerById(id);
+ return customerMapper.selectById(id);
+ }
+
+ /**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
+ */
+ @Override
+ 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);
+ }
+ //鏌ヨ鑱旂郴浜轰俊鎭�
+ List<CustomerContact> customerContactList = customerContactMapper.selectList(
+ new QueryWrapper<CustomerContact>().lambda()
+ .apply("FIND_IN_SET({0}, customer_id)", id)
+ );
+ if (!CollectionUtils.isEmpty(customerContactList)) {
+ List<CustomerContactDto> contactDtoList = customerContactList.stream().map(contact -> {
+ CustomerContactDto contactDto = new CustomerContactDto();
+ BeanUtils.copyProperties(contact, contactDto);
+ return contactDto;
+ }).collect(Collectors.toList());
+ customerVo.setContactList(contactDtoList);
+ }
+
+ return customerVo;
}
/**
@@ -40,8 +131,65 @@
* @return 瀹㈡埛妗ｆ
*/
@Override
- public List<Customer> selectCustomerList(Customer customer) {
- return customerMapper.selectCustomerList(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<CustomerVo> records = customerPage.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ return customerPage;
+ }
+
+ List<Long> customerIds = records.stream()
+ .map(CustomerVo::getId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
+ if (!CollectionUtils.isEmpty(customerIds)) {
+ Map<Long, CustomerFollowUp> latestFollowUpMap = getLatestFollowUpMap(customerIds);
+
+ 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()
+ ));
+ }
+
+ // 杞崲鍏变韩鐢ㄦ埛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);
+ }
+ });
+ }
+
+ return customerPage;
+ }
+
+ private Map<Long, CustomerFollowUp> getLatestFollowUpMap(List<Long> customerIds) {
+ List<CustomerFollowUp> followUps = customerFollowUpService.list(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .in(CustomerFollowUp::getCustomerId, customerIds)
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ );
+
+ return followUps.stream()
+ .collect(Collectors.toMap(
+ CustomerFollowUp::getCustomerId,
+ followUp -> followUp,
+ (existing, replacement) -> existing
+ ));
}
/**
@@ -51,8 +199,14 @@
* @return 缁撴灉
*/
@Override
- public int insertCustomer(Customer customer) {
- return customerMapper.insertCustomer(customer);
+ @Transactional(rollbackFor = Exception.class)
+ public int insertCustomer(CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
+ customerMapper.insert(customer);
+ syncCustomerContacts(customer.getId(), customer.getContactList());
+ return 1;
}
/**
@@ -62,8 +216,118 @@
* @return 缁撴灉
*/
@Override
- public int updateCustomer(Customer customer) {
- return customerMapper.updateCustomer(customer);
+ @Transactional(rollbackFor = Exception.class)
+ public int updateCustomer(CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
+ int rows = customerMapper.updateById(customer);
+ syncCustomerContacts(customer.getId(), customer.getContactList());
+ return rows;
+ }
+
+ private void syncCustomerContacts(Long customerId, List<? extends CustomerContact> contactList) {
+ List<CustomerContact> allContacts = customerContactMapper.selectList(new QueryWrapper<>());
+ Map<String, CustomerContact> submittedContactMap = new LinkedHashMap<>();
+ if (!CollectionUtils.isEmpty(contactList)) {
+ for (CustomerContact contact : contactList) {
+ if (contact == null) {
+ continue;
+ }
+ submittedContactMap.putIfAbsent(buildContactKey(contact), contact);
+ }
+ }
+
+ // 鍏堝悓姝ユ湰娆℃彁浜ょ殑鑱旂郴浜猴紝鎸夆�滃鍚� + 鎵嬫満鍙封�濊仛鍚堝鎴稩D銆�
+ for (CustomerContact contact : submittedContactMap.values()) {
+ contact.setCustomerId(buildContactCustomerIds(allContacts, contact, customerId));
+ if (contact.getId() == null) {
+ customerContactMapper.insert(contact);
+ allContacts.add(contact);
+ } else {
+ customerContactMapper.updateById(contact);
+ replaceLocalContact(allContacts, contact);
+ }
+ }
+
+ Set<String> submittedContactKeys = submittedContactMap.keySet();
+ // 鍐嶅鐞嗘湰娆″凡鍒犻櫎鐨勮仈绯讳汉锛屾妸褰撳墠瀹㈡埛浠庡巻鍙插叧鑱旈噷绉婚櫎銆�
+ for (CustomerContact existingContact : new ArrayList<>(allContacts)) {
+ if (!containsCustomerId(existingContact.getCustomerId(), customerId)) {
+ continue;
+ }
+ if (submittedContactKeys.contains(buildContactKey(existingContact))) {
+ continue;
+ }
+ String updatedCustomerIds = removeCustomerId(existingContact.getCustomerId(), customerId);
+ if (StringUtils.isEmpty(updatedCustomerIds)) {
+ // 娌℃湁鍓╀綑瀹㈡埛鍏宠仈鏃讹紝鐩存帴鍒犻櫎鑱旂郴浜鸿褰曘��
+ customerContactMapper.deleteById(existingContact.getId());
+ } else {
+ existingContact.setCustomerId(updatedCustomerIds);
+ customerContactMapper.updateById(existingContact);
+ }
+ }
+ }
+
+ // 鎸夎仈绯讳汉濮撳悕鍜屾墜鏈哄彿姹囨�诲巻鍙插鎴稩D锛屽苟杩藉姞褰撳墠瀹㈡埛ID銆�
+ private String buildContactCustomerIds(List<CustomerContact> customerContacts, CustomerContact contact, Long customerId) {
+ LinkedHashSet<String> customerIdSet = new LinkedHashSet<>();
+ if (!CollectionUtils.isEmpty(customerContacts)) {
+ customerContacts.stream()
+ .filter(Objects::nonNull)
+ .filter(item -> Objects.equals(item.getContactPerson(), contact.getContactPerson())
+ && Objects.equals(item.getContactPhone(), contact.getContactPhone()))
+ .map(CustomerContact::getCustomerId)
+ .filter(StringUtils::isNotEmpty)
+ .forEach(ids -> Arrays.stream(ids.split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotEmpty)
+ .forEach(customerIdSet::add));
+ }
+ customerIdSet.add(String.valueOf(customerId));
+ return String.join(",", customerIdSet);
+ }
+
+ // 鍒ゆ柇鑱旂郴浜哄叧鑱斿垪琛ㄩ噷鏄惁鍖呭惈褰撳墠瀹㈡埛ID銆�
+ private boolean containsCustomerId(String customerIds, Long customerId) {
+ if (StringUtils.isEmpty(customerIds) || customerId == null) {
+ return false;
+ }
+ String currentCustomerId = String.valueOf(customerId);
+ return Arrays.stream(customerIds.split(","))
+ .map(String::trim)
+ .anyMatch(currentCustomerId::equals);
+ }
+
+ // 浠庤仈绯讳汉鍏宠仈鍒楄〃閲岀Щ闄ゅ綋鍓嶅鎴稩D锛屽苟淇濇寔閫楀彿鎷兼帴鏍煎紡銆�
+ private String removeCustomerId(String customerIds, Long customerId) {
+ if (StringUtils.isEmpty(customerIds) || customerId == null) {
+ return customerIds;
+ }
+ String currentCustomerId = String.valueOf(customerId);
+ return Arrays.stream(customerIds.split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotEmpty)
+ .filter(id -> !currentCustomerId.equals(id))
+ .distinct()
+ .collect(Collectors.joining(","));
+ }
+
+ // 鐢熸垚鑱旂郴浜轰笟鍔″敮涓�閿紝鐢ㄤ簬瀵规湰娆℃彁浜ゆ暟鎹幓閲嶆瘮瀵广��
+ private String buildContactKey(CustomerContact contact) {
+ return StringUtils.defaultString(contact.getContactPerson()) + "_" + StringUtils.defaultString(contact.getContactPhone());
+ }
+
+ // 鏇存柊鍐呭瓨涓殑鑱旂郴浜哄揩鐓э紝閬垮厤鍚庣画澧炲垹鍒ゆ柇浣跨敤鏃ф暟鎹��
+ private void replaceLocalContact(List<CustomerContact> customerContacts, CustomerContact targetContact) {
+ for (int i = 0; i < customerContacts.size(); i++) {
+ CustomerContact customerContact = customerContacts.get(i);
+ if (Objects.equals(customerContact.getId(), targetContact.getId())) {
+ customerContacts.set(i, targetContact);
+ return;
+ }
+ }
}
/**
@@ -73,18 +337,191 @@
* @return 缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int deleteCustomerByIds(Long[] ids) {
- return customerMapper.deleteCustomerByIds(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("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
+ }
+ // 鏌ヨ鏄惁鏈夊凡鍒嗛厤鐨勫叕娴峰鎴�
+ 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);
+ // 鍒犻櫎瀹㈡埛鐨勫叡浜叧绯�
+ customerUserService.remove(
+ new QueryWrapper<CustomerUser>().lambda()
+ .eq(CustomerUser::getCustomerId, id)
+ );
+ }
+
+ // 鍒犻櫎瀹㈡埛涓昏〃鏁版嵁
+ return customerMapper.deleteBatchIds(idList);
+ }
+
+ @Override
+ public List<Customer> selectCustomerListByIds(Long[] ids) {
+ LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(Customer::getId, Arrays.asList(ids));
+ return customerMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<CustomerVo> selectCustomerLists(CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long loginUserId = loginUser.getUserId();
+ return customerMapper.list(customer, loginUserId);
+ }
+
+ @Override
+ public R importData(MultipartFile file, Integer type) {
+ try {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ List<Customer> userList = util.importExcel(file.getInputStream());
+ if (CollectionUtils.isEmpty(userList)) {
+ return R.fail("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ }
+
+ // 鏍规嵁 type 鍙傛暟璁剧疆瀹㈡埛绫诲瀷锛堢娴�/鍏捣锛�
+ if (type != null) {
+ userList.forEach(customer -> {
+ customer.setType(type);
+ });
+ }
+ this.saveOrUpdateBatch(userList);
+ return R.ok(true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail("瀵煎叆澶辫触");
+ }
+
+ }
+
+ @Override
+ public List<Map<String, Object>> customerList(Customer customer) {
+ LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
+
+ // 鑾峰彇鍘熷鏌ヨ缁撴灉
+ List<Map<String, Object>> result = customerMapper.selectMaps(queryWrapper);
+
+ // 灏嗕笅鍒掔嚎鍛藉悕杞崲涓洪┘宄板懡鍚�
+ return result.stream().map(map -> map.entrySet().stream()
+ .collect(Collectors.toMap(
+ entry -> underlineToCamel(entry.getKey()),
+ Map.Entry::getValue))
+ ).collect(Collectors.toList());
+ }
+
+ // 鍒嗛厤鍏捣瀹㈡埛缁欑娴�
+ @Override
+ public void assignCustomer(CustomerDto customerDto) {
+ Customer customer = customerMapper.selectById(customerDto.getId());
+ if (customer.getType() == 1 ) { // 鍏捣涓斿彲鍒嗛厤
+ 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);
+ }
+
+ @Override
+ public Boolean back(Long id) {
+ //灏嗗鎴风殑type鏀逛负1 涓旂洿鎺ュ垎閰嶇粰褰撳墠鐢ㄦ埛
+ Customer customer = customerMapper.selectById(id);
+ customer.setType(1);
+ customer.setIsAssigned(0);
+ return this.updateById(customer);
}
/**
- * 鍒犻櫎瀹㈡埛妗ｆ淇℃伅
- *
- * @param id 瀹㈡埛妗ｆ涓婚敭
- * @return 缁撴灉
+ * 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
- @Override
- public int deleteCustomerById(Long id) {
- return customerMapper.deleteCustomerById(id);
+ private String underlineToCamel(String param) {
+ if (param == null || "".equals(param.trim())) {
+ return "";
+ }
+ int len = param.length();
+ StringBuilder sb = new StringBuilder(len);
+ for (int i = 0; i < len; i++) {
+ char c = param.charAt(i);
+ if (c == '_') {
+ if (++i < len) {
+ sb.append(Character.toUpperCase(param.charAt(i)));
+ }
+ } else {
+ sb.append(Character.toLowerCase(c));
+ }
+ }
+ return sb.toString();
}
}
--
Gitblit v1.9.3