From e9f2adb9ddc511c62e1628fbd527ba7cda8294d4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 09 五月 2025 14:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 02cd697..3dd42a9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,15 +1,23 @@
package com.ruoyi.basic.service.impl;
+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;
/**
@@ -20,6 +28,7 @@
*/
@Service
@AllArgsConstructor
+@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
private CustomerMapper customerMapper;
@@ -31,7 +40,7 @@
*/
@Override
public Customer selectCustomerById(Long id) {
- return customerMapper.selectCustomerById(id);
+ return customerMapper.selectById(id);
}
/**
@@ -42,7 +51,18 @@
*/
@Override
public List<Customer> selectCustomerList(Customer customer) {
- return customerMapper.selectCustomerList(customer);
+ 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());
}
/**
@@ -53,7 +73,10 @@
*/
@Override
public int insertCustomer(Customer customer) {
- return customerMapper.insertCustomer(customer);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Integer tenantId = loginUser.getTenantId();
+ customer.setTenantId(Long.valueOf(tenantId));
+ return customerMapper.insert(customer);
}
/**
@@ -64,7 +87,10 @@
*/
@Override
public int updateCustomer(Customer customer) {
- return customerMapper.updateCustomer(customer);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Integer tenantId = loginUser.getTenantId();
+ customer.setTenantId(Long.valueOf(tenantId));
+ return customerMapper.updateById(customer);
}
/**
@@ -75,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.deleteCustomerById(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