Merge branch 'feature-migration-20230628' of...

Merge branch 'feature-migration-20230628' of git.quantgroup.cn:head_group/xyqb-user2 into feature-migration-20230628

src/main/java/cn/quantgroup/xyqb/service/v2/LoginContext.java

@@ -90,16 +90,6 @@ public class LoginContext {
         if (loginBean.getUserId() != null) {
             User user = userRepository.findByIdAndTenantId(loginBean.getUserId(), loginBean.getTenantId());
 
-            if (StringUtils.isEmpty(loginBean.getOpenId())) {
-                List<WechatUserInfo> wechatUserInfos = wechatService.queryListByUserId(user.getId(), user.getTenantId());
-                if (CollectionUtils.isNotEmpty(wechatUserInfos)) {
-                    wechatUserInfos.stream().filter(i -> sessionStruct.getRegisteredFrom().equals(i.getRegisteredFrom())).forEach(i -> {
-                        loginBean.setOpenId(i.getOpenId());
-                        loginBean.setUnionId(i.getUnionId());
-                    });
-                }
-            }
-
             if (loginReq.isAttachInfo()) {
                 UserInfoEntity userInfoEntity = userInfoRepository.findByUserIdAndTenantId(loginBean.getUserId(), loginBean.getTenantId());
                 loginBean.setInfo(new UserInfo(user, userInfoEntity));

src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java

@@ -148,6 +148,8 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
         LoginProperties loginProperties = new LoginProperties(1, sessionStruct.getRegisteredFrom(), sessionStruct.getTenantId());
         AuthBean authBean = sessionService.createSession(user, loginProperties, LoginType.WECHATLOGIN.ordinal(), sessionStruct.getTenantId(),false);
         LoginBean loginBean = new LoginBean();
+        loginBean.setOpenId(openid);
+        loginBean.setUnionId(unionId);
         if (authBean != null) {
             loginBean.setToken(authBean.getToken());
             loginBean.setPhoneNo(authBean.getPhoneNo());