From b3fc7c3428ddf036b1a632f62c694a3d28b1a306 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 27 三月 2026 15:28:24 +0800
Subject: [PATCH] fix: 注释客户跟随
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 124 insertions(+), 25 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 f24a2d2..20ede93 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -7,20 +7,26 @@
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.mapper.CustomerMapper;
import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+import com.ruoyi.basic.pojo.CustomerRegions;
+import com.ruoyi.basic.service.*;
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.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;
@@ -44,6 +50,14 @@
private final SalesLedgerMapper salesLedgerMapper;
private CustomerMapper customerMapper;
+ private CustomerFollowUpService customerFollowUpService;
+
+ private CustomerFollowUpFileService customerFollowUpFileService;
+
+ private CustomerReturnVisitService customerReturnVisitService;
+
+ private final ICustomerRegionsService customerRegionsService;
+
/**
* 鏌ヨ瀹㈡埛妗ｆ
*
@@ -56,50 +70,128 @@
}
/**
- * 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
*
- * @param customer 瀹㈡埛妗ｆ
- * @return 瀹㈡埛妗ｆ
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
*/
@Override
- public IPage<Customer> selectCustomerList(Page page, Customer customer) {
- // 1. 澶勭悊绌哄�煎満鏅紙鍙傛暟鏍￠獙锛�
- if (page == null) {
- page = Page.of(1, 10); // 榛樿绗�1椤碉紝姣忛〉10鏉℃暟鎹�
- }
+ public CustomerDto selectCustomerDetailById(Long id) {
+ Customer customer = customerMapper.selectById(id);
if (customer == null) {
- customer = new Customer(); // 閬垮厤绌哄璞″鑷寸殑NPE
+ return null;
}
- // 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
+ 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);
+// }
+ // 鍦板尯鍚嶇О
+ CustomerRegions customerRegions = customerRegionsService.getById(customer.getRegionsId());
+ if (customerRegions != null) {
+ dto.setRegionsName(customerRegions.getRegionsName());
+ }
+ return dto;
+ }
+
+ /**
+ * 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
+ *
+ * @param page 鍒嗛〉瀵硅薄
+ * @param customer 瀹㈡埛鏌ヨ鏉′欢
+ * @return 瀹㈡埛妗ｆ鍒嗛〉鍒楄〃
+ */
+ @Override
+ public IPage<CustomerDto> selectCustomerList(Page<Customer> page, Customer customer) {
+ if (page == null) page = Page.of(1, 10);
+ if (customer == null) customer = new Customer();
+
LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
String customerName = customer.getCustomerName();
String customerType = customer.getCustomerType();
+ Long regionsId = customer.getRegionsId();
+
if (StringUtils.isNotBlank(customerName)) {
queryWrapper.like(Customer::getCustomerName, customerName);
}
if (StringUtils.isNotBlank(customerType)) {
- queryWrapper.like(Customer::getCustomerType, customerType);
+ queryWrapper.eq(Customer::getCustomerType, customerType);
}
- // 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
+ if (regionsId != null) {
+ // 璋冪敤 regionsService 鑾峰彇褰撳墠鍦板尯鍙婂叾鎵�鏈夊悗浠ｇ殑 ID 闆嗗悎
+ List<Long> allRegionsIds = customerRegionsService.regionsChildrenIds(regionsId);
+ if (!CollectionUtils.isEmpty(allRegionsIds)) {
+ queryWrapper.in(Customer::getRegionsId, allRegionsIds);
+ } else {
+ queryWrapper.eq(Customer::getRegionsId, regionsId);
+ }
+ }
+
IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);
- // 4. 鏁版嵁澶勭悊锛堝寮虹┖鍊煎畨鍏� & 浠ｇ爜鍙鎬э級
- List<Customer> processedList = customerPage.getRecords().stream()
- .filter(Objects::nonNull) // 杩囨护绌哄璞★紙閬垮厤鍚庣画鎿嶄綔NPE锛�
- .peek(c -> {
- // 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
+ List<CustomerDto> dtoList = customerPage.getRecords().stream()
+ .filter(Objects::nonNull)
+ .map(c -> {
+ CustomerDto dto = new CustomerDto();
+ BeanUtils.copyProperties(c, dto);
+
+ // 鍦板潃鐢佃瘽鎷兼帴
String address = StringUtils.defaultString(c.getCompanyAddress(), "");
String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")"); // 浼樺寲瀛楃涓叉嫾鎺�
+ dto.setAddressPhone(address + "(" + phone + ")");
+
+ // 濉厖鍦板尯鍚嶇О
+ if (c.getRegionsId() != null) {
+ CustomerRegions regions = customerRegionsService.getById(c.getRegionsId());
+ if (regions != null) {
+ dto.setRegionsName(regions.getRegionsName());
+ }
+ }
+
+ // 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
+// CustomerFollowUp followUp = customerFollowUpService.getOne(
+// new LambdaQueryWrapper<CustomerFollowUp>()
+// .eq(CustomerFollowUp::getCustomerId, c.getId())
+// .orderByDesc(CustomerFollowUp::getFollowUpTime)
+// .last("LIMIT 1")
+// );
+//
+// if (followUp != null) {
+// dto.setFollowUpLevel(followUp.getFollowUpLevel());
+// dto.setFollowUpTime(Date.from(followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()));
+// }
+ return dto;
})
.collect(Collectors.toList());
- // 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
- customerPage.setRecords(processedList);
+ IPage<CustomerDto> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
+ resultPage.setRecords(dtoList);
- return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
+ return resultPage;
}
/**
@@ -137,12 +229,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);
}
@@ -163,12 +262,12 @@
try {
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
List<Customer> userList = util.importExcel(file.getInputStream());
- if(CollectionUtils.isEmpty(userList)){
+ if (CollectionUtils.isEmpty(userList)) {
return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
return AjaxResult.success(true);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return AjaxResult.error("瀵煎叆澶辫触");
}
--
Gitblit v1.9.3