From 35f74c2abd95e6913180fbccd864915486eecc48 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 10:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java
index 0186349..9192d50 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java
@@ -8,8 +8,8 @@
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,10 +26,10 @@
* @since 2026/03/04 17:58
*/
@Service
+@RequiredArgsConstructor
public class CustomerReturnVisitServiceImpl extends ServiceImpl<CustomerReturnVisitMapper, CustomerReturnVisit> implements CustomerReturnVisitService {
- @Autowired
- private ReturnVisitReminderService returnVisitReminderService;
+ private final ReturnVisitReminderService returnVisitReminderService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -75,7 +75,7 @@
throw new ServiceException("瀹㈡埛ID涓嶈兘涓虹┖");
}
LambdaQueryWrapper<CustomerReturnVisit> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(CustomerReturnVisit::getCustomerId, customerId);
+ queryWrapper.eq(CustomerReturnVisit::getCustomerPrivatePoolId, customerId);
CustomerReturnVisit returnVisit = baseMapper.selectOne(queryWrapper);
if (returnVisit == null) {
@@ -94,7 +94,7 @@
throw new ServiceException("瀹㈡埛ID涓嶈兘涓虹┖");
}
LambdaQueryWrapper<CustomerReturnVisit> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(CustomerReturnVisit::getCustomerId, customerId);
+ queryWrapper.eq(CustomerReturnVisit::getCustomerPrivatePoolId, customerId);
List<CustomerReturnVisit> returnVisits = baseMapper.selectList(queryWrapper);
for (CustomerReturnVisit returnVisit : returnVisits) {
@@ -124,7 +124,7 @@
if (returnVisit == null) {
throw new ServiceException("鍥炶鎻愰啋鏁版嵁涓嶈兘涓虹┖");
}
- if (returnVisit.getCustomerId() == null) {
+ if (returnVisit.getCustomerPrivatePoolId() == null) {
throw new ServiceException("瀹㈡埛ID涓嶈兘涓虹┖");
}
if (returnVisit.getReminderTime() == null) {
--
Gitblit v1.9.3