修改

package-lock.json

@@ -1069,9 +1069,9 @@
       }
     },
     "node_modules/@madex/ex-ts-dao": {
-      "version": "0.0.29",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@madex/ex-ts-dao/-/@madex/ex-ts-dao-0.0.29.tgz",
-      "integrity": "sha512-VUMxQWNnEkG9H5zt1gffTvFy4rOhISol4mLJ6Tj/dAyg3ljVNWsK0Mqa4+U+O1XspcNCvAgIXm9xYMDTUeWoKA==",
+      "version": "0.0.30",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/@madex/ex-ts-dao/-/@madex/ex-ts-dao-0.0.30.tgz",
+      "integrity": "sha512-U16LCJEkLpSNlNMQSHQFKpC41u1IQOvNC/m8didC/xBUJjUq8sGTIKNfsM+lA653XAWW4ltCEgainx8effPCwg==",
       "license": "ISC",
       "dependencies": {
         "@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master",
@@ -4456,9 +4456,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.16",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/electron-to-chromium/-/electron-to-chromium-1.5.16.tgz",
-      "integrity": "sha512-2gQpi2WYobXmz2q23FrOBYTLcI1O/P4heW3eqX+ldmPVDQELRqhiebV380EhlGG12NtnX1qbK/FHpN0ba+7bLA==",
+      "version": "1.5.18",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
+      "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -5765,9 +5765,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.8",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/follow-redirects/-/follow-redirects-1.15.8.tgz",
-      "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig==",
+      "version": "1.15.9",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
@@ -9596,9 +9596,9 @@
       }
     },
     "node_modules/mongodb": {
-      "version": "6.8.0",
-      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/mongodb/-/mongodb-6.8.0.tgz",
-      "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==",
+      "version": "6.8.1",
+      "resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/mongodb/-/mongodb-6.8.1.tgz",
+      "integrity": "sha512-qsS+gl5EJb+VzJqUjXSZ5Y5rbuM/GZlZUEJ2OIVYP10L9rO9DQ0DGp+ceTzsmoADh6QYMWd9MSdG9IxRyYUkEA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {

src/functional/mvc/service/mUserAssets.service.ts

@@ -2,6 +2,7 @@ import { ormDB, mainUserAsset } from "@madex/ex-ts-dao";
 import { ErrorCode } from "../../../constant/errorCode";
 import BigNumber from "bignumber.js";
 import { any } from "async";
+import { getUserAccountFromCore } from "../../../utils/coreSystemUtils";
 
 
 let _ = require('lodash');
@@ -59,9 +60,8 @@ export async function assetDistribution(user_id: number) {
     return res;
 }
 
-//TODO: 交易资产查询后续补齐 需要查询内存 叶总 提供接口查询
 export async function tradeAssetsDetail(user_id: number, page: number, size: number) {
-    let resList = [];
+    let resList = await getUserAccountFromCore(user_id);
     return resList;
 }
 
@@ -174,16 +174,14 @@ export async function walletAsset2USDTByUid(user_id: number) {
     }
 }
 
-//TODO: 交易资产查询后续补齐 需要查询内存 叶总 提供接口查询
 export async function tradeAsset2USDTByUid(user_id: number) {
     try {
-        //TODO:
         let dbAssetList = await tradeAssetByUid(user_id);
         let totalBalanceUsdt: any = 0;
         let totalHoldsUsdt: any = 0;
         if (dbAssetList && dbAssetList.length) {
             for (let assetItem of dbAssetList) {
-                let symbol = assetItem.symbol;
+                let symbol = assetItem.name;
                 let balance = assetItem.balance;
                 let holds = assetItem.holds;
                 let usdt = await tickerUtils.rateCoin2USDT(symbol);
@@ -207,12 +205,10 @@ export async function tradeAsset2USDTByUid(user_id: number) {
     }
 }
 
-//TODO:需要查询内存 叶总 提供接口查询
 export async function tradeAssetByUid(user_id: number) {
     try {
-        let res: any;
-
-        return res;
+        let resList = await getUserAccountFromCore(user_id);
+        return resList;
     }
     catch (e) {
         logger.error('tradeAssetByUid.error:' + e);
@@ -220,7 +216,6 @@ export async function tradeAssetByUid(user_id: number) {
     }
 }
 
-//TODO:查叶总提供的接口
 export async function tradeAsset2USDTByUids(uids: number[]) {
     try {
         let dbAssetList = await tradeAssetByUids(uids);
@@ -233,7 +228,7 @@ export async function tradeAsset2USDTByUids(uids: number[]) {
             let totalHoldsUsdt: any = 0;
             if (assetList && assetList.length) {
                 for (let assetItem of assetList) {
-                    let symbol = assetItem.symbol;
+                    let symbol = assetItem.name;
                     let balance = assetItem.balance;
                     let holds = assetItem.holds;
                     let usdt = usdtTickerMap[symbol] ? usdtTickerMap[symbol] : await tickerUtils.rateCoin2USDT(symbol);
@@ -262,13 +257,28 @@ export async function tradeAsset2USDTByUids(uids: number[]) {
     }
 }
 
-//TODO: 查叶总提供接口
 export async function tradeAssetByUids(uids: number[]) {
     try {
         if (!uids || !uids.length) {
             throw ErrorCode.PARAM_MISS
         }
-        let dbInfoList = []
+        let task: any = [];
+        for (let uid of uids) {
+            task.push(getUserAccountFromCore(uid));
+        }
+        let taskResList = await Promise.all(task);
+        let dbInfoList: any = [];
+
+        for (let i = 0; i < uids.length; i++) {
+            let oneUserAssetList = taskResList[i];
+            if (oneUserAssetList.length) {
+                for (let item of oneUserAssetList) {
+                    item.user_id = uids[i];
+                    dbInfoList.push(item);
+                }
+            }
+
+        }
         return dbInfoList.length ? dbInfoList : []
     }
     catch (e) {

src/setting/access-limit.ts

@@ -29,14 +29,14 @@ let cmdWhiteList = {
     'user/getInfoByUserId': 1,
     'user/getInfoDetailByUserId': 1,
     //权限管理 - 组织结构
-    'department/pageList':1,
-    'department/allList':1,
-    'department/getDepartmentTree':1,
-    'department/add':1,
-    'department/update':1,
-    'department/del':1,
-    'department/userList/dpIdsOrAccount':1,
-    'position/allList':1,
+    'department/pageList': 1,
+    'department/allList': 1,
+    'department/getDepartmentTree': 1,
+    'department/add': 1,
+    'department/update': 1,
+    'department/del': 1,
+    'department/userList/dpIdsOrAccount': 1,
+    'position/allList': 1,
     //权限管理 - 后台角色管理
     'acl/role/list': 1,
     'acl/role/getByUser': 1,
@@ -84,9 +84,12 @@ let cmdWhiteList = {
     'mUser/manage/kyc/list': 1,
     'mUser/manage/kyc/oneDetail': 1,
     'mUser/manage/kyc/audit': 1,
+    'mUser/manage/kyc/auditors': 1,
     'mUser/manage/walletAsset/detail': 1,
     'mUser/manage/asset/distribution': 1,
     'mUser/manage/tradeAsset/detail': 1,
+    'mUser/manage/order/pending/list': 1,
+    'mUser/manage/order/history/list': 1,
     //资源位管理
     'link/useful/list': 1,
     'link/useful/add': 1,