From 602a2d4fd650ded48e8f4cd1a48f0e6de3b98053 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 五月 2025 17:42:09 +0800
Subject: [PATCH] 1.销售台账 2.关联产品

---
 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 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 e926f01..3dd42a9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -2,15 +2,22 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.ruoyi.basic.mapper.CustomerMapper;
 import com.ruoyi.basic.pojo.Customer;
 import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.LoginUser;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -21,6 +28,7 @@
  */
 @Service
 @AllArgsConstructor
+@Slf4j
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
     private CustomerMapper customerMapper;
 
@@ -43,7 +51,18 @@
      */
     @Override
     public List<Customer> selectCustomerList(Customer customer) {
-        return customerMapper.selectList(new LambdaQueryWrapper<>());
+        LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+
+        if (StringUtils.isNotBlank(customer.getCustomerName())) {
+            queryWrapper.eq(Customer::getCustomerName, customer.getCustomerName());
+        }
+
+        List<Customer> customerList = customerMapper.selectList(queryWrapper);
+
+        // 浣跨敤 Stream 淇敼姣忎釜 Customer 鐨� addressPhone 瀛楁
+        return customerList.stream().peek(c ->
+                c.setAddressPhone(c.getCompanyAddress() + "( " + c.getCompanyPhone() + " )")
+        ).collect(Collectors.toList());
     }
 
     /**
@@ -54,6 +73,9 @@
      */
     @Override
     public int insertCustomer(Customer customer) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Integer tenantId = loginUser.getTenantId();
+        customer.setTenantId(Long.valueOf(tenantId));
         return customerMapper.insert(customer);
     }
 
@@ -65,6 +87,9 @@
      */
     @Override
     public int updateCustomer(Customer customer) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Integer tenantId = loginUser.getTenantId();
+        customer.setTenantId(Long.valueOf(tenantId));
         return customerMapper.updateById(customer);
     }
 
@@ -76,17 +101,21 @@
      */
     @Override
     public int deleteCustomerByIds(Long[] ids) {
-        return customerMapper.deleteCustomerByIds(ids);
+        List<Long> idList = Arrays.asList(ids);
+        return customerMapper.deleteBatchIds(idList);
     }
 
-    /**
-     * 鍒犻櫎瀹㈡埛妗ｆ淇℃伅
-     *
-     * @param id 瀹㈡埛妗ｆ涓婚敭
-     * @return 缁撴灉
-     */
     @Override
-    public int deleteCustomerById(Long id) {
-        return customerMapper.deleteById(id);
+    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 customerList(Customer customer) {
+        LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(Customer::getId, Customer::getCustomerName);
+        return customerMapper.selectMaps(queryWrapper);
     }
 }

--
Gitblit v1.9.3