优化代码，减少不必要的网络微信请求

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -110,7 +110,6 @@ public class UserQueryLogController {
         }else if(pageSize>200){
           pageSize=200;
         }
-
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try{
           for(UserQueryLog ll:userQueryLogs){
@@ -120,26 +119,20 @@ public class UserQueryLogController {
           LOGGER.info("日期时间转换异常");
           return JsonResult.buildErrorStateResult("日期时间转换异常",null);
         }
-
         uqp.setPageSize(pageSize);
         uqp.setPageId(pageId);
         uqp.setPageList(userQueryLogs);
         int yu=total.intValue()%pageSize;
         Double d=Math.ceil(total/pageSize);
-
         uqp.setPages(yu>0?d.intValue()+1:d.intValue());
         return JsonResult.buildSuccessResult("查询成功",uqp);
-
       }catch(Exception e){
         return JsonResult.buildErrorStateResult("查询失败",null);
       }
-
-
   }
 
   @RequestMapping("/queryUserInfo")
   public JsonResult queryForResult(HttpServletRequest request,String key,String keyValues, String columns,Integer pageId,Integer pageSize) {
-
     LOGGER.info("查询条件：key{},columns{}",key,columns);
     String token=request.getHeader(Constants.X_AUTH_TOKEN);
     if(StringUtils.isEmpty(token)){
@@ -162,45 +155,36 @@ public class UserQueryLogController {
     }
     String[] values=keyValues.split("\\n");
     List<String> queryV= Arrays.asList(values);
-
     if(queryV!=null&&queryV.size()>50000){
       return JsonResult.buildErrorStateResult("查询记录数是"+queryV.size()+",超过50000条限制",null);
     }
-
     List<UserQueryInfo> userQueryInfos=new ArrayList<UserQueryInfo>();
     List<UserDetail> userDetails=new ArrayList<UserDetail>();
     Page<UserDetail> userDetailPage=null;
-
     List<Address> addresslist=new ArrayList<Address>();
     HashMap<String,String> phonesCards=new HashMap<String,String>();
-
     if(pageSize==0||pageSize<0){
       pageSize=30;
     }else if(pageSize>200){
       pageSize=200;
     }
-
     //如果维度里面没有保护查询条件则加入条件
     if(!columns.contains(key)){
       columns=columns+","+key;
     }
-
     if(Objects.equals(key, "userId")){
       List<Long> userIds=new ArrayList<Long>();
       try{
         for(String s:queryV){
           if(s.length()>8){
-
             return JsonResult.buildErrorStateResult("查询的userId"+s+"长度超过8位",null);
           }
           long uid=Long.valueOf(s);
           userIds.add(uid);
         }
-
       }catch(Exception e){
         return JsonResult.buildErrorStateResult("查询的userId有误",null);
       }
-
       userDetailPage=userDetailService.getUserDetailsPage(userIds,null,null,pageId,pageSize,"auto");
     }else if(Objects.equals(key, Constants.PHONE_NO)){
       for(String pn:queryV){
@@ -208,7 +192,6 @@ public class UserQueryLogController {
           return JsonResult.buildErrorStateResult("查询的手机号码"+pn+"格式有误",null);
         }
       }
-
       userDetailPage=userDetailService.getUserDetailsPage(null,queryV,null,pageId,pageSize,"auto");
     }else if(Objects.equals(key, "idNo")){
       IdcardValidator iv = new IdcardValidator();
@@ -219,14 +202,11 @@ public class UserQueryLogController {
       }
       userDetailPage=userDetailService.getUserDetailsPage(null,null,queryV,pageId,pageSize,"auto");
     }
-
     if(userDetailPage!=null){
       userDetails=userDetailPage.getContent();
     }
-
     if(columns.contains("bankCard")){
       //需加银行卡信息
-
       if(Objects.equals(key, Constants.PHONE_NO)){
         phonesCards=getBankCardsByPhoneNos(queryV);
         if(phonesCards!=null&&phonesCards.get("errorMsg")!=null&&!StringUtils.isEmpty(phonesCards.get("errorMsg"))){
@@ -242,9 +222,7 @@ public class UserQueryLogController {
           return JsonResult.buildErrorStateResult(phonesCards.get("errorMsg"),null);
         }
       }
-
     }
-
     if(columns.contains("address")){
       List<Long> uidss=new ArrayList<Long>();
       //加地址信息
@@ -254,9 +232,7 @@ public class UserQueryLogController {
       if(uidss!=null&&uidss.size()>0){
         addresslist=addressService.findByUserIds(uidss);
       }
-
     }
-
     for(UserDetail ud:userDetails){
       UserQueryInfo uqi=new UserQueryInfo();
       if(columns.contains("idNo")){
@@ -280,11 +256,8 @@ public class UserQueryLogController {
       if(columns.contains("bankCard")&&phonesCards!=null){
         uqi.setBankCards(phonesCards.get(ud.getPhoneNo()));
       }
-
       userQueryInfos.add(uqi);
-
     }
-
     //保存记录
     UserQueryLog log=new UserQueryLog();
     log.setQueryItems(columns.replace("userId","用户ID").replace(Constants.PHONE_NO,"手机号").replace("name","姓名").replace("idNo","身份证号").replace("bankCard","银行卡号").replace("address","地址"));
@@ -294,14 +267,12 @@ public class UserQueryLogController {
     log.setQueryDetail(keyValues.replace("\n",";"));
     log.setLoginUserName(userName);
     userQueryLogService.save(log);
-
     PageModel<UserQueryInfo> uqi=new PageModel<UserQueryInfo>();
     uqi.setPageId(pageId);
     uqi.setPageList(userQueryInfos);
     uqi.setPageSize(pageSize);
     uqi.setPages(userDetailPage.getTotalPages());
     uqi.setTotal(userDetailPage.getTotalElements());
-
     return JsonResult.buildSuccessResult("查询成功",uqi);
   }
 

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -221,29 +221,27 @@ public class WeChatController implements IBaseController {
     if(Objects.equals(schema, "https:")){
       domain = userUiDomainS;
     }
-
     // 从code获取token
     Merchant merchant = merchantService.findMerchantByName(systemKey);
     AccessTokenResponse token = wechatService.getToken(code);
     LOGGER.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：merchant:{},token:{}", merchant, token);
-    if (token == null) {
+    if (Objects.isNull(token) || StringUtils.isBlank(token.getOpenId())) {
       // 让用户登录，不关联微信, 构造不关联微信的url
       redirectNormalUrl(response, merchant, registerFrom,domain);
       return;
     }
-    WechatUserInfo userInfo =
-            wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
-                    token.getOpenId());
-    LOGGER.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：WechatUserInfo - from wechat api:{}", userInfo);
-    if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
-      // 让用户登录，不关联微信, 构造不关联微信的url
-      redirectNormalUrl(response, merchant, registerFrom, domain);
-      return;
-    }
-    WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
-    LOGGER.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：WechatUserInfo - from DB:{}", userInfo);
+    // 获取已授权信息 - db
+    WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(token.getOpenId());
+    LOGGER.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：WechatUserInfo - from DB:{}", userInfoInDb);
     // welcome 首次登录
-    if (userInfoInDb == null) {
+    if (Objects.isNull(userInfoInDb)) {
+      WechatUserInfo userInfo = wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(), token.getOpenId());
+      LOGGER.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：WechatUserInfo - from wechat api:{}", userInfo);
+      if (Objects.isNull(userInfo) || StringUtils.isBlank(userInfo.getOpenId())) {
+        // 让用户登录，不关联微信, 构造不关联微信的url
+        redirectNormalUrl(response, merchant, registerFrom, domain);
+        return;
+      }
       // 微信用户首次登录界面, 首先保存userInfo, 跳入到微信注册登录界面
       if (StringUtils.isNotBlank(userInfo.getNickName())) {
         // 替换所有,UTF-8编码时4字节的Emoji表情字符
@@ -260,13 +258,14 @@ public class WeChatController implements IBaseController {
       redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom, domain);
       return;
     }
-    if (userInfoInDb.getUserId() == null) {
+    if (Objects.isNull(userInfoInDb.getUserId())) {
       // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
       redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
       return;
     }
     User user = userService.findById(userInfoInDb.getUserId());
-    if (user == null) {
+    if (Objects.isNull(user)) {
+      // 用户已经微信登录了，但是关联信用钱包用户信息无效，跳转到注册页面
       redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
       return;
     }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

@@ -174,12 +174,11 @@ public class UserDetailServiceImpl implements IUserDetailService {
     return new PageRequest(pageNumber - 1, pagzSize, sort);
   }
 
-
-  public Page<UserDetail> getUserDetailsPage(List<Long> userId,List<String> phoneNos,List<String> idNos, int pageNumber, int pageSize,
-                                String sortType) {
+  @Override
+  public Page<UserDetail> getUserDetailsPage(List<Long> userId, List<String> phoneNos, List<String> idNos, int pageNumber, int pageSize,
+                                             String sortType) {
     PageRequest pageRequest = buildPageRequest(pageNumber, pageSize, sortType);
     Specification<UserDetail> spec = valueInSpecification(userId,phoneNos,idNos);
-
     return userDetailRepository.findAll(spec, pageRequest);
   }