From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/service/partner/PartnerService.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/partner/PartnerService.java b/src/main/java/com/mzl/flower/service/partner/PartnerService.java
index 5461de7..3be43a8 100644
--- a/src/main/java/com/mzl/flower/service/partner/PartnerService.java
+++ b/src/main/java/com/mzl/flower/service/partner/PartnerService.java
@@ -18,6 +18,7 @@
import com.mzl.flower.service.system.UserService;
import com.mzl.flower.utils.DateUtils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.time.LocalDateTime;
+import java.util.Collection;
import java.util.List;
@Service
@@ -198,6 +200,9 @@
partner.setContactTel(dto.getContactTel());
userMapper.updateById(user);
}
+ partner.setIdCards(dto.getIdCards());
+ partner.setAddress(dto.getAddress());
+ partner.setCityWarehouse(dto.getCityWarehouse());
partner.update(SecurityUtils.getUserId());
partnerMapper.updateById(partner);
@@ -272,6 +277,17 @@
if(user == null){
throw new ValidationException("用户不存在");
}
+
+ // 查看当前合伙人的手机号是否被占用
+
+ final List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>()
+ .eq(User::getDeleted, 0)
+ .eq(User::getType, Constants.USER_TYPE.partner.name())
+ .eq(User::getLoginName, dto.getUsername()));
+ if(CollectionUtils.isNotEmpty(userList)){
+ throw new ValidationException("用户已存在");
+ }
+
partner.setContactTel(dto.getUsername());
partner.update(SecurityUtils.getUserId());
partnerMapper.updateById(partner);
@@ -282,4 +298,5 @@
userMapper.updateById(user);
}
+
}
--
Gitblit v1.9.3