优化小程序登陆 减少请求adam接口次数

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -74,14 +74,15 @@ public class SweetWechatLoginServiceImpl {
             String phoneNumber = wxMaPhoneNumberInfo.getPhoneNumber();
             String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
             String countryCode = wxMaPhoneNumberInfo.getCountryCode();
-            // 获取adam用户信息 自动注册
-            ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(wxMaPhoneNumberInfo.getPurePhoneNumber());
-            AdamUserInfoVo userInfoVoData = userInfoVo.getData();
-            String mobile = userInfoVoData.getMobile();
-            String userId = userInfoVoData.getUid();
             // mysql redis
-            SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsersOfPhone(mobile);
+            SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsersOfPhone(purePhoneNumber);
+            String userId = "";
             if (null == sweetAppletUsers) {
+                // 获取adam用户信息 自动注册
+                ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(purePhoneNumber);
+                AdamUserInfoVo userInfoVoData = userInfoVo.getData();
+                userId = userInfoVoData.getUid();
+
                 LinkedList<String> sqlsA = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqlsA.add(SqlMapping.get("sweet_applet_users.insert"));
@@ -108,15 +109,17 @@ public class SweetWechatLoginServiceImpl {
                 if (null != sweetWechatUsersSky) {
                     feignStoneIntegralClient.doTask(4, userId);
                 }*/
+            } else {
+                userId = sweetAppletUsers.getUserId();
             }
             // 返回给前端数据
             HashMap<String, Object> userInfo = CollectionUtil.mapStringObject();
             userInfo.put("unionId", unionId);
             userInfo.put("openId", openId);
             userInfo.put("userId", userId);
-            userInfo.put("getPhoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
-            userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
-            userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());
+            userInfo.put("getPhoneNumber", phoneNumber);
+            userInfo.put("getPurePhoneNumber", purePhoneNumber);
+            userInfo.put("getCountryCode", countryCode);
             return ResponseDto.success(userInfo);
         } catch (Exception e) {
             log.error("WechatUserInfoError Exception:{}", e);