微信登录继续调整

src/main/java/com/jeeplus/modules/sys/service/HpUserService.java

@@ -1357,45 +1357,39 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
      */
     private HpUser upDateHpUser(HpUser hpUser, String userIds, String loginType) {
         //没有微信unionid等信息则从废弃的数据里获取
-        if (StringUtils.isBlank(hpUser.getUnionid())) {
-            String[] userIdArray = userIds.split(",");
-            for (int i = 0; i < userIdArray.length; i++) {
-                HpUser hpUser1 = this.get(userIdArray[i]);
-                if (StringUtils.isNotBlank(hpUser1.getUnionid())) {
-                    hpUser.setUnionid(hpUser1.getUnionid());
-                }
-                if (StringUtils.isNotBlank(hpUser1.getWxOpenid())) {
-                    hpUser.setWxOpenid(hpUser1.getWxOpenid());
-                }
-                if (StringUtils.isNotBlank(hpUser1.getMinaOpenid())) {
-                    hpUser.setMinaOpenid(hpUser1.getMinaOpenid());
-                }
+        String[] userIdArray = userIds.split(",");
+        for (int i = 0; i < userIdArray.length; i++) {
+            HpUser hpUser1 = this.get(userIdArray[i]);
+            if (StringUtils.isNotBlank(hpUser1.getUnionid())) {
+                hpUser.setUnionid(hpUser1.getUnionid());
+            }
+            if (StringUtils.isNotBlank(hpUser1.getWxOpenid())) {
+                hpUser.setWxOpenid(hpUser1.getWxOpenid());
+            }
+            if (StringUtils.isNotBlank(hpUser1.getMinaOpenid())) {
+                hpUser.setMinaOpenid(hpUser1.getMinaOpenid());
             }
         }
         //如果没有accesstoken等信息
-        if (StringUtils.isBlank(hpUser.getAccessToken())) {
-            String[] userIdArray = userIds.split(",");
-            for (int i = 0; i < userIdArray.length; i++) {
-                HpUser hpUser1 = this.get(userIdArray[i]);
-                if (StringUtils.isNotBlank(hpUser1.getAccessToken())) {
-                    hpUser.setAccessToken(hpUser1.getAccessToken());
-                }
-                if (hpUser1.getAccessTokenEndtime() != null) {
-                    hpUser.setAccessTokenEndtime(hpUser1.getAccessTokenEndtime());
-                }
-                if (StringUtils.isNotBlank(hpUser1.getRefreshToken())) {
-                    hpUser.setRefreshToken(hpUser1.getRefreshToken());
-                }
+        String[] userIdArray1 = userIds.split(",");
+        for (int i = 0; i < userIdArray1.length; i++) {
+            HpUser hpUser1 = this.get(userIdArray1[i]);
+            if (StringUtils.isNotBlank(hpUser1.getAccessToken())) {
+                hpUser.setAccessToken(hpUser1.getAccessToken());
+            }
+            if (hpUser1.getAccessTokenEndtime() != null) {
+                hpUser.setAccessTokenEndtime(hpUser1.getAccessTokenEndtime());
+            }
+            if (StringUtils.isNotBlank(hpUser1.getRefreshToken())) {
+                hpUser.setRefreshToken(hpUser1.getRefreshToken());
             }
         }
         //如果没有小程序SessionKey信息
-        if (StringUtils.isBlank(hpUser.getMinaSessionKey())) {
-            String[] userIdArray = userIds.split(",");
-            for (int i = 0; i < userIdArray.length; i++) {
-                HpUser hpUser1 = this.get(userIdArray[i]);
-                if (StringUtils.isNotBlank(hpUser1.getMinaSessionKey())) {
-                    hpUser.setMinaSessionKey(hpUser1.getMinaSessionKey());
-                }
+        String[] userIdArray2 = userIds.split(",");
+        for (int i = 0; i < userIdArray2.length; i++) {
+            HpUser hpUser1 = this.get(userIdArray2[i]);
+            if (StringUtils.isNotBlank(hpUser1.getMinaSessionKey())) {
+                hpUser.setMinaSessionKey(hpUser1.getMinaSessionKey());
             }
         }
         switch (loginType) {
@@ -1680,26 +1674,25 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         } else {
                             hpUser = hpUserList.get(0);
                         }
-                        hpUser.setWxOpenid(openId);
-                        hpUser.setUnionid(unionId);
-                    }
-
-                    //如果登录方式不包含微信授权，则添加
-                    if (!hpUser.getLoginType().contains(AppLoginsEnum.WX_AUTH.getType())) {
-                        String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.WX_AUTH.getType();
-                        hpUser.setLoginType(loginType);
-                    }
-                    if (StringUtils.isBlank(hpUser.getUserToken())) {
-                        //用户token作为请求的标准
-                        long t1 = System.currentTimeMillis();
-                        String timestamp = String.valueOf(t1);
-                        String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
-                        hpUser.setUserToken(user_token);
-                    }
-                    if (StringUtils.isBlank(hpUser.getUserType())) {
-                        hpUser.setUserType("0");
                     }
                 }
+                hpUser.setWxOpenid(openId);
+                hpUser.setUnionid(unionId);
+                //如果登录方式不包含微信授权，则添加
+                if (!hpUser.getLoginType().contains(AppLoginsEnum.WX_AUTH.getType())) {
+                    String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.WX_AUTH.getType();
+                    hpUser.setLoginType(loginType);
+                }
+                if (StringUtils.isBlank(hpUser.getUserToken())) {
+                    //用户token作为请求的标准
+                    long t1 = System.currentTimeMillis();
+                    String timestamp = String.valueOf(t1);
+                    String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
+                    hpUser.setUserToken(user_token);
+                }
+                if (StringUtils.isBlank(hpUser.getUserType())) {
+                    hpUser.setUserType("0");
+                }
             } else {
                 //绑不绑定手机号
                 //绑定的情况
@@ -2204,25 +2197,25 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         } else {
                             hpUser = hpUserList.get(0);
                         }
-                        hpUser.setMinaOpenid(openId);
-                        hpUser.setUnionid(unionId);
-                    }
-                    //如果登录方式不包含小程序授权，则添加
-                    if (!hpUser.getLoginType().contains(AppLoginsEnum.MINA.getType())) {
-                        String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.MINA.getType();
-                        hpUser.setLoginType(loginType);
-                    }
-                    if (StringUtils.isBlank(hpUser.getUserToken())) {
-                        //用户token作为请求的标准
-                        long t1 = System.currentTimeMillis();
-                        String timestamp = String.valueOf(t1);
-                        String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
-                        hpUser.setUserToken(user_token);
-                    }
-                    if (StringUtils.isBlank(hpUser.getUserType())) {
-                        hpUser.setUserType("0");
                     }
                 }
+                hpUser.setMinaOpenid(openId);
+                hpUser.setUnionid(unionId);
+                //如果登录方式不包含小程序授权，则添加
+                if (!hpUser.getLoginType().contains(AppLoginsEnum.MINA.getType())) {
+                    String loginType = hpUser.getLoginType() + "," + AppLoginsEnum.MINA.getType();
+                    hpUser.setLoginType(loginType);
+                }
+                if (StringUtils.isBlank(hpUser.getUserToken())) {
+                    //用户token作为请求的标准
+                    long t1 = System.currentTimeMillis();
+                    String timestamp = String.valueOf(t1);
+                    String user_token = Md5Encrypt.md5(hpUser.getId() + timestamp);
+                    hpUser.setUserToken(user_token);
+                }
+                if (StringUtils.isBlank(hpUser.getUserType())) {
+                    hpUser.setUserType("0");
+                }
             } else {
                 //绑不绑定手机号
                 //绑定的情况