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/controller/api/v2/UserApiV2Controller.java

@@ -98,9 +98,10 @@ public class UserApiV2Controller {
      * @see <a href="http://yapi.quantgroups.com/project/17/interface/api/65734">批量查询用户信息</a>
      */
     @PostMapping("/batchInfo")
-    public JsonResult<List<User>> batchInfo(@RequestBody BatchInfoReq batchInfoReq) {
+    public JsonResult<List<UserBean>> batchInfo(@RequestBody BatchInfoReq batchInfoReq) {
         SessionStruct sessionStruct = XyqbSessionContextHolder.getXSession();
         List<User> userList = null;
+        List<WechatUserInfo> wechatUserInfo = null;
         //1、校验
         if (CollectionUtils.isEmpty(batchInfoReq.getUserIds())
                 && CollectionUtils.isEmpty(batchInfoReq.getUuids())
@@ -124,7 +125,7 @@ public class UserApiV2Controller {
         }
 
         if (StringUtils.isNotEmpty(batchInfoReq.getAppId()) && CollectionUtils.isNotEmpty(batchInfoReq.getOpenIds())) {
-            List<WechatUserInfo> wechatUserInfo = wechatService.findWechatUserInfoFromDb(batchInfoReq.getOpenIds(), batchInfoReq.getAppId(), sessionStruct.getTenantId());
+            wechatUserInfo = wechatService.findWechatUserInfoFromDb(batchInfoReq.getOpenIds(), batchInfoReq.getAppId(), sessionStruct.getTenantId());
             List<Long> userIds = wechatUserInfo.stream().map(WechatUserInfo::getUserId).collect(Collectors.toList());
             ;
             if (CollectionUtils.isEmpty(wechatUserInfo) || CollectionUtils.isEmpty(userIds)) {
@@ -135,7 +136,7 @@ public class UserApiV2Controller {
         }
 
         if (StringUtils.isNotEmpty(batchInfoReq.getAppId()) && CollectionUtils.isNotEmpty(batchInfoReq.getUnionIds())) {
-            List<WechatUserInfo> wechatUserInfo = wechatService.findUnionIdsAndOpenIdAndTenantId(batchInfoReq.getUnionIds(), batchInfoReq.getAppId(), sessionStruct.getTenantId());
+            wechatUserInfo = wechatService.findUnionIdsAndOpenIdAndTenantId(batchInfoReq.getUnionIds(), batchInfoReq.getAppId(), sessionStruct.getTenantId());
             List<Long> userIds = wechatUserInfo.stream().map(WechatUserInfo::getUserId).collect(Collectors.toList());
             ;
             if (CollectionUtils.isEmpty(wechatUserInfo) || CollectionUtils.isEmpty(userIds)) {
@@ -150,7 +151,7 @@ public class UserApiV2Controller {
             throw new BizException(BizExceptionEnum.UN_EXIT_USER);
         }
 
-        return JsonResult.buildSuccessResultGeneric(userList);
+        return JsonResult.buildSuccessResultGeneric(UserBean.from(userList,wechatUserInfo));
     }
 
 }

src/main/java/cn/quantgroup/xyqb/model/UserBean.java

@@ -3,6 +3,11 @@ package cn.quantgroup.xyqb.model;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
 import lombok.Data;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 @Data
 public class UserBean {
@@ -23,9 +28,9 @@ public class UserBean {
     public static UserBean from(User user, WechatUserInfo wechatUserInfo) {
         UserBean userBean = new UserBean();
         userBean.setUserId(user.getId());
-        userBean.setPhoneNo(userBean.getPhoneNo());
+        userBean.setPhoneNo(user.getPhoneNo());
         userBean.setRegisteredFrom(user.getRegisteredFrom());
-        userBean.setUuid(userBean.getUuid());
+        userBean.setUuid(user.getUuid());
         userBean.setEnable(user.getEnable());
         userBean.setTenantId(user.getTenantId());
         if (wechatUserInfo != null) {
@@ -35,4 +40,31 @@ public class UserBean {
         }
         return userBean;
     }
+
+    public static List<UserBean> from(List<User> userList, List<WechatUserInfo> wechatUserInfoList) {
+        List<UserBean> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(userList)) {
+            userList.forEach(user -> {
+                UserBean userBean = new UserBean();
+                userBean.setUserId(user.getId());
+                userBean.setPhoneNo(user.getPhoneNo());
+                userBean.setRegisteredFrom(user.getRegisteredFrom());
+                userBean.setUuid(user.getUuid());
+                userBean.setEnable(user.getEnable());
+                userBean.setTenantId(user.getTenantId());
+                if (CollectionUtils.isNotEmpty(wechatUserInfoList)) {
+                    Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst();
+
+                    if (optionalWechatUserInfo.isPresent()) {
+                        WechatUserInfo wechatUserInfo = optionalWechatUserInfo.get();
+                        userBean.setOpenId(wechatUserInfo.getOpenId());
+                        userBean.setUnionId(wechatUserInfo.getUnionId());
+                        userBean.setAppId(wechatUserInfo.getAppId());
+                    }
+                }
+                result.add(userBean);
+            });
+        }
+        return result;
+    }
 }

src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java

@@ -117,7 +117,7 @@ public class WechatServiceImpl implements IWechatService {
 
     @Override
     public WechatUserInfo findWechatUserInfoFromDb(String openId,String appId,Integer tenantId) {
-        return weChatUserRepository.findByOpenIdAndAppNameAndAppIdAndTenantId(openId, "xyqb",appId,tenantId);
+        return weChatUserRepository.findByOpenIdAndAppIdAndTenantId(openId,appId,tenantId);
     }
 
     @Override