修改

package-lock.json

@@ -1069,9 +1069,9 @@
       }
     },
     "node_modules/@madex/ex-ts-dao": {
-      "version": "0.0.27",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@madex/ex-ts-dao/-/@madex/ex-ts-dao-0.0.27.tgz",
-      "integrity": "sha512-+wt6GSr/Gs+KBjNL1U7xsSUaYGhWNiPhIAjXvlb/Klmx7lzf/95MDbKmD2+bC1ydbTknsiG1XyNE/0Iu/tDS4Q==",
+      "version": "0.0.28",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@madex/ex-ts-dao/-/@madex/ex-ts-dao-0.0.28.tgz",
+      "integrity": "sha512-DWAieApyLqFuKYxpMjHhQbodx9qKqbBOaaSEuhhfD/lZrjFDQ81M5tpl7nbFApIantQ361d+E7TpWJC/oUdAcg==",
       "license": "ISC",
       "dependencies": {
         "@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master",
@@ -1617,9 +1617,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.16.4",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@types/node/-/node-20.16.4.tgz",
-      "integrity": "sha512-ioyQ1zK9aGEomJ45zz8S8IdzElyxhvP1RVWnPrXDf6wFaUb+kk1tEcVVJkF7RPGM0VWI7cp5U57oCPIn5iN1qg==",
+      "version": "20.16.5",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@types/node/-/node-20.16.5.tgz",
+      "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -4456,9 +4456,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.13",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
-      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
+      "version": "1.5.14",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/electron-to-chromium/-/electron-to-chromium-1.5.14.tgz",
+      "integrity": "sha512-bEfPECb3fJ15eaDnu9LEJ2vPGD6W1vt7vZleSVyFhYuMIKm3vz/g9lt7IvEzgdwj58RjbPKUF2rXTCN/UW47tQ==",
       "dev": true,
       "license": "ISC"
     },

src/functional/mvc/control/mUserManage.control.ts

@@ -11,7 +11,7 @@ import { isLimitUserId } from "../../../utils/mUserCommonUtils";
 let isIp = require('is-ip');
 
 /**
- * Madex 用户列表
+ * Madex 用户列表/kyc用户列表
  * @param req
  * @param infoVO
  */
@@ -20,7 +20,13 @@ export const userList = async (req: any, queryVO: QueryVO) => {
     try {
         queryVO.page = Optional.opt(queryVO, 'page', 1);
         queryVO.size = Optional.opt(queryVO, 'size', 20);
-        let res = await mUserManageService.userList(queryVO);
+        let condition = String(queryVO.condition);
+        //查询类型 1:uid/姓名/邮箱/证件号  2:充币/提币地址
+        let condition_type = 1;
+        if (condition && condition.length >= 32) {
+            condition_type = 2;
+        }
+        let res = await mUserManageService.userList(Number(queryVO.page), Number(queryVO.size), condition, condition_type);
         return Res3Utils.result(res);
     }
     catch (e) {

src/functional/mvc/control/mUserRealName.control.ts

@@ -20,11 +20,8 @@ export const kycList = async (req: any, queryVO: QueryVO) => {
     try {
         queryVO.page = Optional.opt(queryVO, 'page', 1);
         queryVO.size = Optional.opt(queryVO, 'size', 20);
-        let currentUserId = await getCurrentUserId(req.cookies.session_id);
-        let dbInfo = await getOneAclUserByUid(currentUserId);
-        let isAdmin = dbInfo.user_type == AclUserInfoConst.USER_TYPE.ADMIN
 
-        let res = await mUserRealNameService.kycList(queryVO, isAdmin);
+        let res = await mUserRealNameService.kycList(queryVO);
         return Res3Utils.result(res);
     }
     catch (e) {

src/functional/mvc/service/aclDepartment.service.ts

@@ -224,7 +224,34 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
     let account = aclDepartmentPageVO.account;
     let dIds = aclDepartmentPageVO.dIds;
     let pageData: any;
-    if (account) {
+    //部门 和 account 都作为查询条件时 先查用户
+    if (dIds && account) {
+        let userList = await getAclUserData(account);
+        //没有直接返回
+        if (!userList.length) {
+            pageData = {
+                count: 0,
+                rows: []
+            }
+            return pageData;
+        }
+        let uids: number[] = [];
+        let userMap = {}
+        for (let item of userList) {
+            userMap[item.user_id] = item;
+            uids.push(item.user_id);
+        }
+        //有则分页查询部门用户
+        pageData = await getDpUserPageData(dIds, page, size, []);
+        for (let oneItem of pageData.rows) {
+            oneItem.account = userMap[oneItem.user_id] ? userMap[oneItem.user_id].account : "";
+            oneItem.phone = userMap[oneItem.user_id] ? userMap[oneItem.user_id].phone : "";
+            oneItem.email = userMap[oneItem.user_id] ? userMap[oneItem.user_id].email : "";
+            oneItem.user_status = userMap[oneItem.user_id] ? userMap[oneItem.user_id].user_status : "";
+            oneItem.remark = userMap[oneItem.user_id] ? userMap[oneItem.user_id].remark : "";
+        }
+    }
+    else if (account) {
         pageData = await getAclUserPageData(account, page, size);
         if (pageData.rows && pageData.rows.length) {
             let uids = pageData.rows.map(item => item.user_id);
@@ -246,17 +273,17 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
         }
     }
     else {
-        pageData = await getDpUserPageData(dIds, page, size);
+        pageData = await getDpUserPageData(dIds, page, size, []);
         if (pageData.rows && pageData.rows.length) {
             let uids = pageData.rows.map(item => item.user_id);
-            let udpList = await aclUserInfo.prototype.findAll({
+            let userInfoList = await aclUserInfo.prototype.findAll({
                 where: {
                     user_id: { [madAdminOrmDB.Op.in]: uids }
                 },
                 raw: true
             });
             let userMap = {}
-            for (let item of udpList) {
+            for (let item of userInfoList) {
                 userMap[item.user_id] = item;
             }
             for (let oneItem of pageData.rows) {
@@ -264,6 +291,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
                 oneItem.phone = userMap[oneItem.user_id] ? userMap[oneItem.user_id].phone : "";
                 oneItem.email = userMap[oneItem.user_id] ? userMap[oneItem.user_id].email : "";
                 oneItem.user_status = userMap[oneItem.user_id] ? userMap[oneItem.user_id].user_status : "";
+                oneItem.remark = userMap[oneItem.user_id] ? userMap[oneItem.user_id].remark : "";
             }
 
         }
@@ -271,11 +299,14 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
     return pageData;
 }
 
-async function getDpUserPageData(dIds: string, page: number, size: number) {
+async function getDpUserPageData(dIds: string, page: number, size: number, uids: number[]) {
     let where = {};
     if (dIds) {
         where['department_id'] = dIds;
     }
+    if (uids.length) {
+        where['user_id'] = { [madAdminOrmDB.Op.in]: uids }
+    }
     let resList = await aclUserDepartmentPosition.prototype.findAndCount({
         where: where,
         limit: size,
@@ -306,7 +337,7 @@ async function getAclUserPageData(account: string, page: number, size: number) {
         }
     }
     let resList = await aclUserInfo.prototype.findAndCount({
-        attributes: ['user_id', 'account', 'phone', 'email', 'user_status'],
+        attributes: ['user_id', 'account', 'phone', 'email', 'user_status', 'remark'],
         where: where,
         limit: size,
         offset: (page - 1) * size,
@@ -335,7 +366,7 @@ async function getAllUserDepartmentPositionMap() {
     });
     let userMap = {};
     for (let item of userList) {
-        userMap[item.user_id] = item.account;
+        userMap[item.user_id] = item.remark;
     }
 
     for (let item of udpList) {
@@ -356,6 +387,35 @@ async function getAllUserDepartmentPositionMap() {
 }
 
 
+async function getAclUserData(account: string) {
+    let where: {};
+    if (!isNaN(Number(account))) {
+        where = {
+            [madAdminOrmDB.Op.or]: {
+                user_id: Number(account),
+                account: { [madAdminOrmDB.Op.like]: `${account}%` },
+                email: { [madAdminOrmDB.Op.like]: `${account}%` },
+            }
+        }
+    }
+    else {
+        where = {
+            [madAdminOrmDB.Op.or]: {
+                account: { [madAdminOrmDB.Op.like]: `${account}%` },
+                email: { [madAdminOrmDB.Op.like]: `${account}%` },
+            }
+        }
+    }
+    let resList = await aclUserInfo.prototype.findAll({
+        attributes: ['user_id', 'account', 'phone', 'email', 'user_status', 'remark'],
+        where: where,
+        order: [["user_id", "asc"]],
+        raw: true
+    });
+    return resList;
+
+}
+
 
 
 

src/functional/mvc/service/aclUser.service.ts

@@ -320,43 +320,6 @@ export async function updateUserStatus(userId: any, userStatus: number) {
     }
 }
 
-export async function findAllForPage(page: number, size: number, userId?: number,
-                                     typeArr?: any, statusArr?: any,
-                                     fromTime?: any, toTime?: any, remark?: any) {
-    try {
-        let where = Object.create(null);
-        if (userId) {
-            where.user_id = userId
-        }
-        if (typeArr) {
-            where.user_type = { [madAdminOrmDB.Op.in]: typeArr };
-        }
-        if (statusArr) {
-            where.user_status = { [madAdminOrmDB.Op.in]: statusArr };
-        }
-        if (fromTime && toTime) {
-            where.createdAt = { [madAdminOrmDB.Op.between]: [fromTime, toTime] };
-        }
-        if (remark) {
-            where.remark = { [madAdminOrmDB.Op.like]: `${remark}%` };
-        }
-
-        let resList = await aclUserInfo.prototype.findAndCount({
-            where: where,
-            limit: size,
-            offset: (page - 1) * size,
-            order: [["user_id", "asc"]],
-            raw: true
-        });
-        return resList;
-    }
-    catch (e) {
-        logger.error('aclUserService.findAllForPage.error:' + e)
-        throw e;
-    }
-
-}
-
 async function dealReturnData(rows: any) {
     if (!rows.length) {
         return

src/functional/mvc/service/coinAddress.service.ts

+import { ormDB, coinAddress } from "@madex/ex-ts-dao";
+import { ErrorCode } from "../../../constant/errorCode";
+
+
+export const getCoinAddressMapByUids = async function (uids: number[]){
+    if (!uids.length){
+        throw ErrorCode.PARAM_MISS;
+    }
+    let dbInfoList = await coinAddress.prototype.findAll({
+        where: {
+            user_id: { [ormDB.Op.in]: uids }
+        },
+        raw: true
+    });
+
+    let resMap = {};
+    for (let item of dbInfoList) {
+        resMap[item.user_id] = item
+    }
+    return resMap;
+}

src/functional/mvc/service/coinWithdraw.service.ts

+import { ormDB, coinWithdraw, } from "@madex/ex-ts-dao";
+import { ErrorCode } from "../../../constant/errorCode";
+
+
+export const getCoinWithdrawMapByUids = async function (uids: number[]) {
+    if (!uids.length) {
+        throw ErrorCode.PARAM_MISS;
+    }
+    let dbInfoList = await coinWithdraw.prototype.findAll({
+        where: {
+            user_id: { [ormDB.Op.in]: uids }
+        },
+        raw: true
+    });
+
+    let resMap = {};
+    for (let item of dbInfoList) {
+        resMap[item.user_id] = item
+    }
+    return resMap;
+}
\ No newline at end of file

src/functional/mvc/service/mUserManage.service.ts

-import { ormDB, userAccountChangeLog, userInfo, userProfile } from "@madex/ex-ts-dao";
+import { coinAddress, coinWithdraw, ormDB, userAccountChangeLog, userInfo, userProfile } from "@madex/ex-ts-dao";
 import { ErrorCode } from "../../../constant/errorCode";
 import { getProfileByUserIds } from "./mUserProfile.service";
-import { getRealNameByUserIds, getRealNameByUserId } from "./mUserRealName.service";
+import { getRealNameMapByUserIds, getRealNameByUserId } from "./mUserRealName.service";
 import { MUserRedisKey } from "../../../constant/mUserRedisKey";
-import { getMUserInfoByEmail, getMUserInfoByUid, sendEmail, updateMUserInfo } from "../../../utils/mUserUtils";
+import { getMUserInfoByEmail, getMUserInfoByUid, getUserInfoMapByUids, sendEmail, updateMUserInfo } from "../../../utils/mUserUtils";
 import { existEmail, getProcessingEmailListByMUserId } from "./mUserAccountChangeLog.service";
 import { AFTER_MODIFIED_MAILBOX_TIP, EMAIL_FORBID_TEMPLATE } from "../../../constant/emailTemplateType";
 import { addLog, MUserLogType } from "./mUserOptLog.service";
@@ -13,6 +13,8 @@ import { getFatherUserId, getUidsByFatherUid } from "./mUserInfoSon.service";
 import { recordMUserOperateLog, TYPE } from "./mUserAccountOperateLog.service";
 import { tradeAsset2USDTByUids, walletAsset2USDTByUids } from "./mUserAssets.service";
 import BigNumber from "bignumber.js";
+import { getCoinWithdrawMapByUids } from "./coinWithdraw.service";
+import { getCoinAddressMapByUids } from "./coinAddress.service";
 
 let _ = require('lodash');
 let { logger, datetimeUtils } = require('@madex/ex-js-public');
@@ -27,99 +29,91 @@ export interface QueryVO {
 
     user_id?: number | any;
 
-    kyc_status?: number | any;
-
-    lock_status?: number | any;
-
-    totp_status?: number | any;
-
-    start_date?: Date | any;
-
-    end_date?: Date | any;
-
     email?: string | any
 
     totp_code?: string | any
 
     lock_type?: number | any//锁定类型 1 锁定当前账户 2 锁定当前账户及其所有子账户
 
+    condition?: string
 
 }
 
 
-export async function userList(queryVO: QueryVO) {
-    let where = Object.create(null);
-    if (queryVO.user_id) {
-        where.user_id = queryVO.user_id;
-    }
-
-    if (!isNaN(queryVO.lock_status)) {
-        where.is_lock = queryVO.lock_status;
-    }
+export async function userList(page: number, size: number, condition: string, condition_type: number) {
 
-    if (!isNaN(queryVO.totp_status)) {
-        where.totp_encrypt = queryVO.totp_status ? { [ormDB.Op.not]: null } : { [ormDB.Op.is]: null };
-    }
+    let pageData: any;
+    let where: any
+    //uid/姓名/邮箱/证件号 查询
+    if (condition_type == 1) {
+        //没有查询条件
+        if (condition == "undefined" || condition == undefined || condition == "") {
+            where = "";
+        }
+        else {
+            where = {
+                email: String(condition),
+                real_name: String(condition),
+                phone: String(condition),
+                identity: String(condition),
+            }
+            //数字类型的话 补充uid作为查询条件
+            if (!isNaN(Number(condition))) {
+                where['user_id'] = Number(condition)
+            }
+        }
 
-    if (queryVO.start_date && queryVO.end_date) {
-        let from = datetimeUtils.trim(queryVO.start_date, 's');
-        let to = datetimeUtils.trim(queryVO.end_date, 's');
-        where.createdAt = { [ormDB.Op.between]: [from, to] };
+        //
+        pageData = await userInfo.prototype.findAndCount({
+            attributes: ['user_id', 'email', 'real_name', 'createdAt', 'totp_encrypt', 'is_lock', 'identity'],
+            where: where ? { [ormDB.Op.or]: where } : {},
+            limit: size,
+            offset: (page - 1) * size,
+            order: [["user_id", "asc"]],
+            raw: true
+        });
+        await buildReturnData(pageData, false, true, true);
+        return pageData;
     }
-
-    let resList = await userInfo.prototype.findAndCount({
-        attributes: ['user_id', 'email', 'real_name', 'createdAt', 'totp_encrypt', 'is_lock'],
-        where: where,
-        limit: queryVO.size,
-        offset: (Number(queryVO.page) - 1) * Number(queryVO.size),
-        order: [["user_id", "asc"]],
-        raw: true
-    });
-    if (resList.rows.length > 0) {
-        let uids = resList.rows.map(item => item.user_id);
-        //个人资料
-        let profileMap = await getProfileByUserIds(uids);
-        //实名信息
-        let realNameMap = await getRealNameByUserIds(uids);
-        //钱包余额
-        let walletAssetMap = await walletAsset2USDTByUids(uids);
-        //交易账户余额
-        let tradeAssetMap = await tradeAsset2USDTByUids(uids);
-        //替换rows的集合
-        let infoList: any = [];
-        for (let item of resList.rows) {
-            let wallet_account_balance = new BigNumber(String(walletAssetMap[item.user_id].balance_usdt)).add(new BigNumber(String(walletAssetMap[item.user_id].holds_usdt)));
-            let trade_account_balance = new BigNumber(String(tradeAssetMap[item.user_id].balance_usdt)).add(new BigNumber(String(tradeAssetMap[item.user_id].holds_usdt)));
-            let oneProfile = profileMap[item.user_id];
-            let oneRealName = realNameMap[item.user_id];
-            let one = {
-                user_id: item.user_id,
-                nick_name: oneProfile ? (oneProfile.nick_name ? oneProfile.nick_name : "") : "",
-                real_name: item.real_name,
-                email: item.email,
-                register_date: item.createdAt,
-                spot_trade_total: 0,//TODO:现货交易总量
-                contract_trade_total: 0,//TODO:永续合约交易总量
-                spot_balance: 0,//TODO:现货余额
-                contract_balance: 0,//TODO:永续合约余额
-                assets_total: 0,//TODO: 总资产
-                spot_order: 0,//TODO: 现货订单数量
-                contract_order: 0,//TODO: 永续合约订单数量
-                wallet_account_balance: wallet_account_balance,//钱包账户余额
-                trade_account_balance: trade_account_balance,//TODO: 交易账户余额
-                kyc_status: oneRealName ? oneRealName.status : 0,//0未提交，1审核中，2审核不通过，3审核通过
-                kyc_type: oneRealName ? oneRealName.type : 0,//1身份证，2护照，3驾驶证
-                kyc_identity: oneRealName ? oneRealName.identity : 0,//证件号
-                is_bind_totp: item.totp_encrypt ? 1 : 0,
-                lock_status: item.is_lock, //0 否 1 是
+    else {
+        if (condition) {
+            where = {
+                address: String(condition)
             }
-            infoList.push(one);
         }
-        resList.rows = infoList;
+        pageData = await coinAddress.prototype.findAndCount({
+            attributes: ['user_id', 'address'],
+            where: where,
+            limit: size,
+            offset: (page - 1) * size,
+            order: [["id", "asc"]],
+            raw: true
+        });
+        if (!pageData.rows.length) {
+            if (condition) {
+                where = {
+                    to_address: String(condition)
+                }
+            }
+            pageData = await coinWithdraw.prototype.findAndCount({
+                attributes: ['user_id', 'to_address'],
+                where: where,
+                limit: size,
+                offset: (page - 1) * size,
+                order: [["id", "asc"]],
+                raw: true
+            });
+            await buildReturnData(pageData, true, true, false);
+            return pageData;
+        }
+        else {
+            await buildReturnData(pageData, true, false, true);
+            return pageData;
 
+        }
     }
 
-    return resList;
+
 }
 
 
@@ -385,6 +379,87 @@ async function modifyUserEmail(m_user_id: number, email_new: string, email_old:
 
 }
 
+/**
+ * 构造返回数据
+ * @param pageData 分页数据
+ * @param fill_user_info 是否需要 填充 user_info 的数据 0 否 1 是
+ * @param fill_coin_address 是否需要 填充 coin_address 的数据 0 否 1 是
+ * @param fill_coin_withdraw 是否需要 填充 coin_withdraw 的数据 0 否 1 是
+ */
+async function buildReturnData(pageData: any, fill_user_info: boolean, fill_coin_address: boolean, fill_coin_withdraw: boolean) {
+    if (pageData.rows.length > 0) {
+        let uids = pageData.rows.map(item => item.user_id);
+        //注意顺序
+        let task: any = [];
+        //实名信息
+        task.push(getRealNameMapByUserIds(uids));
+        //钱包余额
+        task.push(walletAsset2USDTByUids(uids));
+        //交易账户余额
+        task.push(tradeAsset2USDTByUids(uids));
+        //用户信息
+        task.push(fill_user_info ? getUserInfoMapByUids(uids) : null);
+        //充值地址
+        task.push(fill_coin_address ? getCoinAddressMapByUids(uids) : null);
+        //提现地址
+        task.push(fill_coin_withdraw ? getCoinWithdrawMapByUids(uids) : null);
+
+        let [realNameMap, walletAssetMap, tradeAssetMap, userInfoMap, coinAddrMap, withdrawMap] = await Promise.all(task);
+
+        //替换rows的集合
+        let infoList: any = [];
+
+        for (let item of pageData.rows) {
+            let user_id = item.user_id;
+            //初始化
+            let wallet_account_balance = new BigNumber(String(walletAssetMap[item.user_id].balance_usdt)).add(new BigNumber(String(walletAssetMap[item.user_id].holds_usdt)));
+            let trade_account_balance = new BigNumber(String(tradeAssetMap[item.user_id].balance_usdt)).add(new BigNumber(String(tradeAssetMap[item.user_id].holds_usdt)));
+            let oneRealName = realNameMap[item.user_id];
+            let one = {
+                user_id: user_id,
+                real_name: item.real_name ? item.real_name : "",
+                email: item.email ? item.email : "",
+                register_date: item.createdAt ? item.createdAt : "",
+                spot_trade_total: 0,//TODO:现货交易总量
+                contract_trade_total: 0,//TODO:永续合约交易总量
+                spot_balance: 0,//TODO:现货余额
+                contract_balance: 0,//TODO:永续合约余额
+                assets_total: 0,//TODO: 总资产
+                spot_order: 0,//TODO: 现货订单数量
+                contract_order: 0,//TODO: 永续合约订单数量
+                wallet_account_balance: wallet_account_balance,//钱包账户余额
+                trade_account_balance: trade_account_balance,//TODO: 交易账户余额
+                kyc_status: oneRealName ? oneRealName.status : 0,//0未提交，1审核中，2审核不通过，3审核通过
+                kyc_type: oneRealName ? oneRealName.type : 0,//1身份证，2护照，3驾驶证
+                kyc_identity: item.kyc_identity ? item.kyc_identity : "",
+                is_bind_totp: item.totp_encrypt ? 1 : 0,
+                lock_status: item.is_lock ? item.is_lock : "",
+                address: item.address ? item.address : "",
+                to_address: item.to_address ? item.to_address : "",
+            };
+            //填充用户信息
+            if (userInfoMap) {
+                one['real_name'] = userInfoMap[user_id] ? userInfoMap[user_id].real_name : "";
+                one['email'] = userInfoMap[user_id] ? userInfoMap[user_id].email : "";
+                one['register_date'] = userInfoMap[user_id] ? userInfoMap[user_id].createdAt : "";
+                one['kyc_identity'] = userInfoMap[user_id] ? userInfoMap[user_id].identity : "";
+                one['is_bind_totp'] = userInfoMap[user_id] && userInfoMap[user_id].totp_encrypt ? 1 : 0;
+                one['lock_status'] = userInfoMap[user_id] ? userInfoMap[user_id].is_lock : "";
+            }
+            //充币地址
+            if (coinAddrMap) {
+                one['address'] = coinAddrMap[user_id] ? coinAddrMap[user_id].address : "";
+            }
+            //提币地址
+            if (withdrawMap) {
+                one['to_address'] = withdrawMap[user_id] ? withdrawMap[user_id].to_address : "";
+            }
+            infoList.push(one);
+        }
+        pageData.rows = infoList;
+    }
+}
+
 
 
 

src/functional/mvc/service/mUserRealName.service.ts

@@ -31,6 +31,16 @@ export interface QueryVO {
     audit_deny?: string,
 
     comment?: string
+
+    type?: number//证件类型 1身份证，2护照，3驾驶证
+
+    source?: number// 认证来源  1 web  2 app
+
+    auditor?: number//审核人员id
+
+    from_time?: Date | any
+
+    to_time?: Date | any
 }
 
 export async function getRealNameByUserId(user_id: number | any) {
@@ -43,7 +53,7 @@ export async function getRealNameByUserId(user_id: number | any) {
     return dbInfo ? dbInfo : null
 }
 
-export async function getRealNameByUserIds(userIds: number[]) {
+export async function getRealNameMapByUserIds(userIds: number[]) {
 
     let dbInfoList = await userRealName.prototype.findAll({
         where: {
@@ -59,22 +69,17 @@ export async function getRealNameByUserIds(userIds: number[]) {
 }
 
 
-export async function kycList(queryVO: QueryVO, isAdmin: boolean) {
+export async function kycList(queryVO: QueryVO) {
     let where = {}
-    if (isAdmin) {
-        if (queryVO.user_id) {
-            where["user_id"] = queryVO.user_id
+    if (queryVO.user_id) {
+        //uid 是否在受限范围内
+        if (isLimitUserId(queryVO.user_id)) {
+            throw ErrorCode.UID_LIMIT
         }
+        where["user_id"] = queryVO.user_id;
     }
     else {
-        if (queryVO.user_id) {
-            //uid 是否在受限范围内
-            if (isLimitUserId(queryVO.user_id)) {
-                throw ErrorCode.UID_LIMIT
-            }
-            where["user_id"] = queryVO.user_id
-        }
-        else {
+        if (UID_MIN && UID_LIMIT.length) {
             where[ormDB.Op.and] = [{
                 user_id: { [ormDB.Op.gte]: UID_MIN }
             },
@@ -82,16 +87,44 @@ export async function kycList(queryVO: QueryVO, isAdmin: boolean) {
                     user_id: { [ormDB.Op.notIn]: UID_LIMIT },
                 }]
         }
+        else {
+            where["user_id"] = { [ormDB.Op.gte]: UID_MIN }
+        }
     }
     if (!isNaN(Number(queryVO.status))) {
         where["status"] = queryVO.status
     }
+    if (queryVO.source) {
+        //来源
+        if (queryVO.source == 1) {
+            where["delta"] = ""
+        }
+        else {
+            where[ormDB.Op.and] = [{
+                delta: { [ormDB.Op.not]: null }
+            },
+                {
+                    delta: { [ormDB.Op.ne]: "" },
+                }]
+        }
+
+    }
+    if (queryVO.type) {
+        where["type"] = queryVO.type
+    }
+    if (queryVO.auditor) {
+        where["auditor"] = queryVO.auditor
+    }
+    if (queryVO.from_time && queryVO.to_time) {
+        where['updatedAt'] = { [ormDB.Op.between]: [queryVO.from_time, queryVO.to_time] }
+    }
+
     let resList = await userRealName.prototype.findAndCount({
         attributes: ['id', 'user_id', 'status', 'createdAt'],
         where: where,
         limit: queryVO.size,
         offset: (Number(queryVO.page) - 1) * Number(queryVO.size),
-        order: [["id", "desc"]],
+        order: [["updatedAt", "desc"]],
         raw: true
     });
 

src/functional/mvc/service/userAuthConfig.service.ts

@@ -32,8 +32,6 @@ export interface AuthConfigVO {
 
     updatedAt?: Date | any;
 
-    user_type?: number | any;
-
     totp_code?: any
 
 }

src/utils/aclUserUtils.ts

@@ -24,51 +24,7 @@ export const getCurrentUserId = async function (sessionId: string) {
     return currentUser.userId;
 }
 
-/**
- * 判断是否是管理员 通过 UID
- * @param user_id
- */
-export const isAdminUserByUid = async function (user_id: number) {
-    let dbInfo = await getOneAclUserByUid(user_id);
-    if (dbInfo.user_type != AclUserInfoConst.USER_TYPE.ADMIN) {
-        throw ErrorCode.NO_PERMISSION
-    }
-}
-
-/**
- * 判断是否是超管 通过 UID
- * @param user_id
- */
-export const isSuperAdminUserByUid = async function (user_id: number) {
-    let dbInfo = await getOneAclUserByUid(user_id);
-    if (dbInfo.user_type != AclUserInfoConst.USER_TYPE.SUPER_ADMIN) {
-        throw ErrorCode.NO_PERMISSION
-    }
-}
 
-/**
- * 判断是否是管理员 通过 session_id
- * @param sessionId
- */
-export const isAdminUserBySessionId = async function (sessionId: string) {
-    let currentUserId = await getCurrentUserId(sessionId);
-    let dbInfo = await getOneAclUserByUid(currentUserId);
-    if (dbInfo.user_type != AclUserInfoConst.USER_TYPE.ADMIN) {
-        throw ErrorCode.NO_PERMISSION
-    }
-}
-
-/**
- * 判断是否是超管 通过 session_id
- * @param sessionId
- */
-export const isSuperAdminUserBySessionId = async function (sessionId: string) {
-    let currentUserId = await getCurrentUserId(sessionId);
-    let dbInfo = await getOneAclUserByUid(currentUserId);
-    if (dbInfo.user_type != AclUserInfoConst.USER_TYPE.SUPER_ADMIN) {
-        throw ErrorCode.NO_PERMISSION
-    }
-}
 /**
  * 通过 user_id 查询用户
  * @param user_id

src/utils/mUserUtils.ts

-import { userInfo } from "@madex/ex-ts-dao";
+import { ormDB, userInfo } from "@madex/ex-ts-dao";
 import { requestUtils, logger } from "@madex/ex-js-public";
 import { config } from "@madex/ex-js-common";
 import { ErrorCode } from "../constant/errorCode";
@@ -58,4 +58,22 @@ export const updateMUserInfo = async function (user_id: number, updateInfo: any)
             user_id: user_id
         }
     });
+}
+
+export async function getUserInfoMapByUids(uids: number[]) {
+    if (!uids.length) {
+        throw ErrorCode.PARAM_MISS;
+    }
+    let dbInfoList = await userInfo.prototype.findAll({
+        where: {
+            user_id: { [ormDB.Op.in]: uids }
+        },
+        raw: true
+    });
+
+    let resMap = {};
+    for (let item of dbInfoList) {
+        resMap[item.user_id] = item
+    }
+    return resMap;
 }
\ No newline at end of file