feat:充值流水统计

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/UserDTO.java

@@ -71,6 +71,7 @@ public class UserDTO extends SysUser {
      * true 当前部门及子部门
      */
     private Boolean isDeepDept = false;
+
     private List<Long> deptIds;
 
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java

@@ -22,6 +22,7 @@ package com.bsd.pjcloud.admin.api.feign;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
+import com.bsd.pjcloud.admin.api.vo.UserVO;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
@@ -77,6 +78,9 @@ public interface RemoteUserService {
     @GetMapping("/user/list")
     R<List<SysUser>> getUserById(@RequestParam("userIds") List<Long> userIds);
 
+    @GetMapping("/user/user-dept")
+    R<List<UserVO>> getUserDeptByIds(@RequestParam("userIds") List<Long> userIds);
+
     /**
      * 通过社交账号或手机号查询用户、角色信息
      *

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/utils/DataUtil.java

@@ -6,8 +6,10 @@ import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.entity.SysMenu;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.vo.SysUserFaceVo;
+import com.bsd.pjcloud.admin.api.vo.UserVO;
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.admin.api.vo.base.BaseFacesInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
 import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import lombok.experimental.UtilityClass;
@@ -106,6 +108,20 @@ public class DataUtil {
         return v;
     }
 
+    public <T extends BaseUserDeptInterface> List<T> convertUserDeptList(List<T> list, Map<Long, UserVO> map) {
+        return CollectionUtils.convertList(list, user -> convertUserDept(user, map.get(user.getUserId())));
+    }
+
+    public <T extends BaseUserDeptInterface> T convertUserDept(T v, UserVO user) {
+        if (ObjectUtil.isEmpty(user)) return v;
+        v.setUsername(user.getName());
+        v.setUserMobile(user.getPhone());
+        v.setUserAvatar(user.getAvatar());
+        v.setUserDeptId(user.getDeptId());
+        v.setUserDeptName(user.getDeptName());
+        return v;
+    }
+
     public <T extends BaseDeptInterface> List<T> convertDeptList(List<T> list, Map<Long, SysDept> map) {
         return CollectionUtils.convertList(list, user -> convertDept(user, map.get(user.getDeptId())));
     }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/base/BaseUserDeptInterface.java

@@ -0,0 +1,45 @@
+package com.bsd.pjcloud.admin.api.vo.base;
+
+public interface BaseUserDeptInterface {
+    /**
+     * 用户id
+     */
+    Long getUserId();
+
+    void setUserId(Long userId);
+
+    /**
+     * 用户名
+     */
+    String getUsername();
+
+    void setUsername(String username);
+
+    /**
+     * 用户手机号
+     */
+    String getUserMobile();
+
+    void setUserMobile(String userMobile);
+
+    /**
+     * 用户头像
+     */
+    String getUserAvatar();
+
+    void setUserAvatar(String userAvatar);
+
+    /**
+     * 用户部门id
+     */
+    Long getUserDeptId();
+
+    void setUserDeptId(Long userDeptId);
+
+    /**
+     * 用户部门
+     */
+    String getUserDeptName();
+
+    void setUserDeptName(String deptName);
+}