测试环境合并集成ES 20240113

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1,12 +1,10 @@
 package com.sqx.modules.app.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -17,7 +15,10 @@ import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.getui.push.v2.sdk.ApiHelper;
 import com.getui.push.v2.sdk.GtApiConfiguration;
@@ -34,24 +35,28 @@ import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.qcloudsms.SmsSingleSenderResult;
-import com.sqx.common.exception.SqxException;
 import com.sqx.common.utils.DateUtils;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.dao.MsgDao;
 import com.sqx.modules.app.dao.UserDao;
-import com.sqx.modules.app.dto.AuthCertNoDTO;
+import com.sqx.modules.app.dao.UserVipDao;
 import com.sqx.modules.app.entity.*;
+import com.sqx.modules.app.mapper.TbUserBlacklistMapper;
 import com.sqx.modules.app.service.*;
 import com.sqx.modules.app.utils.JwtUtils;
 import com.sqx.modules.app.utils.UserConstantInterface;
 import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
+import com.sqx.modules.course.dao.CourseDao;
+import com.sqx.modules.course.entity.Course;
 import com.sqx.modules.discSpinning.service.DiscSpinningService;
+import com.sqx.modules.es.mapper.EsOrdersMapper;
 import com.sqx.modules.file.utils.Md5Utils;
 import com.sqx.modules.invite.service.InviteService;
 import com.sqx.modules.message.entity.MessageInfo;
 import com.sqx.modules.message.service.MessageService;
+import com.sqx.modules.orders.entity.Orders;
 import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.service.SysUserService;
 import com.sqx.modules.utils.HttpClientUtil;
@@ -68,6 +73,7 @@ import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
+import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -75,14 +81,14 @@ import org.springframework.transaction.annotation.Transactional;
 import weixin.popular.api.SnsAPI;
 import weixin.popular.util.JsonUtil;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
 
 /**
  * 用户
@@ -1438,7 +1444,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         wrapper.eq(Orders::getStatus, 1);
         wrapper.eq(Orders::getOrdersType, 1);
         List<Orders> orders = esOrdersMapper.selectList(wrapper);
-        if(CollUtil.isEmpty(orders)){
+        if (CollUtil.isEmpty(orders)) {
             PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(new ArrayList<>());
             return PageUtils.page(pageInfo, true);
         }
@@ -1677,8 +1683,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
 
     @Override
-    public void addBlackUser(Long userId,String behavior) {
+    public void addBlackUser(Long userId, String behavior) {
-        log.info("异常用户id, 异常操作: {},{}", userId,behavior);
+        log.info("异常用户id, 异常操作: {},{}", userId, behavior);
         UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, userId));
         if (userInfo != null && StrUtil.isNotBlank(userInfo.getCertNo())) {
             TbUserBlacklist userBlacklist = new TbUserBlacklist();
@@ -1690,7 +1696,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         update(null, new LambdaUpdateWrapper<UserEntity>().eq(UserEntity::getUserId, userId)
                 .set(UserEntity::getStatus, 0)
                 .set(UserEntity::getPlatform, behavior)
-                .set(UserEntity::getUpdateTime,DateUtil.now()));
+                .set(UserEntity::getUpdateTime, DateUtil.now()));
     }
 
     @Override