From 85d5dea7408e1ae74e4c7f460bf84caae3754753 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 08 二月 2025 16:53:44 +0800
Subject: [PATCH] fix:用户列表查询
---
src/main/java/com/mzl/flower/service/system/UserService.java | 122 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/system/UserService.java b/src/main/java/com/mzl/flower/service/system/UserService.java
index 3ddf79c..2f0febf 100644
--- a/src/main/java/com/mzl/flower/service/system/UserService.java
+++ b/src/main/java/com/mzl/flower/service/system/UserService.java
@@ -7,12 +7,11 @@
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.BindWechatDTO;
+import com.mzl.flower.dto.request.CreateWechatUserDTO;
+import com.mzl.flower.dto.request.customer.UpdateCustomerDTO;
import com.mzl.flower.dto.request.system.*;
import com.mzl.flower.dto.response.current.CurrentUserDTO;
-import com.mzl.flower.dto.response.system.EmployeeDTO;
-import com.mzl.flower.dto.response.system.MenuTreeDTO;
-import com.mzl.flower.dto.response.system.UserDetailsDTO;
-import com.mzl.flower.dto.response.system.UserListDTO;
+import com.mzl.flower.dto.response.system.*;
import com.mzl.flower.entity.point.CustomerPoint;
import com.mzl.flower.entity.system.*;
import com.mzl.flower.enums.TrueOrFalseEnum;
@@ -20,21 +19,29 @@
import com.mzl.flower.mapper.system.*;
import com.mzl.flower.service.customer.CustomerService;
import com.mzl.flower.service.partner.PartnerService;
+import com.mzl.flower.service.payment.RedisLockService;
import com.mzl.flower.service.point.CustomerPointService;
+import com.mzl.flower.service.supplier.StationService;
import com.mzl.flower.service.supplier.SupplierService;
import com.mzl.flower.utils.TreeBuilderUtil;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.concurrent.TimeUnit;
@Service
@Transactional
@@ -79,17 +86,23 @@
@Autowired
private CustomerPointMapper customerPointMapper;
+ @Autowired
+ private StationService stationService;
+ @Autowired
+ RedissonClient redissonClient;
public User findUserByOpenId(String openId, String sessionKey, String unionId
, String imgUrl, String nickname,String userType){
List<String> userTypes = new ArrayList<>();
userTypes.add(userType);
- User user = userMapper.getByOpenID(openId,userTypes);
- if(user == null){
+ List<User> userList = userMapper.getByOpenID(openId,userTypes);
+ if(CollectionUtils.isEmpty(userList)){
throw new ValidationException("请注册账号后至\"个人中心-绑定微信\"后再使用微信登录");
}
- user.setNickName(nickname);
+ User user=userList.get(0);
+// user.setNickName(nickname);
+ user.setNickName(user.getLoginName());
user.setPicture(imgUrl);
user.update(user.getId());
userMapper.updateById(user);
@@ -107,6 +120,19 @@
}
public void bindWechat(String userId, String openId, String unionId, String sessionKey, BindWechatDTO dto) {
+ // 查看微信是否已经绑定过用户
+
+ User user = userMapper.selectById(userId);
+ if(ObjectUtils.isEmpty(user)){
+ throw new ValidationException("当前用户不存在");
+ }
+
+
+ List<User> userList=wechatMapper.selectUserByOpenId(openId,user.getType());
+ if(!CollectionUtils.isEmpty(userList)){
+ throw new ValidationException("该微信已绑定其他账号");
+ }
+
UserWechat wechat = wechatMapper.selectOne(new LambdaQueryWrapper<UserWechat>()
.eq(UserWechat::getUserId,userId));
if(wechat == null){
@@ -125,6 +151,8 @@
wechat.setRealName(dto.getRealName());
wechatMapper.updateById(wechat);
}
+
+
}
@@ -208,6 +236,8 @@
result.setSupplierDTO(supplierService.getCurrentSupplier());
}else if(Constants.USER_TYPE.partner.name().equals(user.getType())){
result.setPartnerDTO(partnerService.getCurrentPartner());
+ }else if (Constants.USER_TYPE.admin.name().equals(user.getType())){
+ result.setMainWarehouse(stationService.getMainWarehouse(user.getId()));
}
result.setBindWechat(wechatMapper.selectCount(new LambdaQueryWrapper<UserWechat>()
.eq(UserWechat::getUserId, userId)) > 0);
@@ -478,4 +508,82 @@
.eq(User::getVipGrade,getVipGrade);
return userMapper.selectList(queryWrapper);
}
+
+ /**
+ * 查看微信是否已经存在用户
+ * @param openId
+ * @param sessionKey
+ * @param unionId
+ * @param userType
+ * @return
+ */
+ public User getExistUserByOpenId(String openId, String sessionKey, String unionId, String userType) {
+ List<String> userTypes = new ArrayList<>();
+ userTypes.add(userType);
+ List<User> userList = userMapper.getByOpenID(openId,userTypes);
+ if(!CollectionUtils.isEmpty(userList)){
+ return userList.get(0);
+ }
+ return null;
+ }
+
+ public void registWxUser(CreateWechatUserDTO dto) {
+ String RETISTER_KEY = "%s_%s";
+ RLock lock = redissonClient.getLock(String.format(RETISTER_KEY,dto.getPurePhoneNumber(),dto.getUserType()));
+ try {
+ // 获取锁，最多等待 10 秒，锁自动释放时间 30 秒
+ if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
+ try{
+ // 其次查找当前loginName是prephonenume的，userType是customer的用户存在不存在
+ if (StringUtils.isEmpty(dto.getPurePhoneNumber()) && StringUtils.isEmpty(dto.getPhoneNumber())) {
+ throw new ValidationException("微信获取的电话号码为空！无法注册");
+ }
+ // 1：查看用户存在不存在
+ List<String> userTypes = new ArrayList<>();
+ userTypes.add(dto.getUserType());
+ User user = findByLoginName(dto.getPurePhoneNumber(), userTypes);
+ if (ObjectUtils.isEmpty(user)) {
+ // 是新用户，需要注册
+ user = new User();
+ user.setId(UUIDGenerator.getUUID());
+ user.setLoginName(dto.getPurePhoneNumber());
+ user.setTel(dto.getPurePhoneNumber());
+ user.setNickName(dto.getPurePhoneNumber());
+ user.setPassword(passwordEncoder.encode("12345678"));
+ user.setType(dto.getUserType());
+ user.setStatus(Constants.STATUS_ACTIVE);
+ user.setIsSys(Constants.N);
+ user.create();
+ userMapper.insert(user);
+
+ // 注册商户信息
+ UpdateCustomerDTO updateCustomerDTO = new UpdateCustomerDTO();
+ updateCustomerDTO.setUserId(user.getId());
+ if (StringUtils.isNotBlank(dto.getPurePhoneNumber())) {
+ updateCustomerDTO.setName("花满芫-" + dto.getPurePhoneNumber().substring(dto.getPurePhoneNumber().length() - 4));
+
+ }
+ customerService.addOrUpdateCustomer(updateCustomerDTO);
+ }
+
+ BindWechatDTO wechatDTO = new BindWechatDTO();
+ wechatDTO.setRealName(dto.getPurePhoneNumber());
+ bindWechat(user.getId(), dto.getOpenId(), dto.getUnionId(), dto.getSessionKey(), wechatDTO);
+ }finally {
+ lock.unlock();
+ }
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public Page<UserListInfoDTO> searchUserInfos(SearchUserDTO dto, Page page) {
+ List<UserListInfoDTO> result = userMapper.searchUserInfo(page, dto);
+
+ page.setRecords(result);
+ return page;
+ }
+
+
}
--
Gitblit v1.9.3