Skip to content

T
ts-api-demo
Project 'zhuangke/ts-api-demo' was moved to 'wmvm/ts-api-demo'. Please update any links and bookmarks that may still have the old path.
Commit e5f58fee authored by ml's avatar ml
Browse files
Options

修改

parent 84f83c6c
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 33 deletions
package-lock.json
View file @ e5f58fee
......@@ -1069,9 +1069,9 @@
}
},
"node_modules/@madex/ex-ts-dao": {
"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==",
"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==",
"license": "ISC",
"dependencies": {
"@madex/ex-js-public": "git+ssh://git@bitbucket.org/biiigle/ex-js-public.git#master",
......@@ -3322,9 +3322,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001655",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
"integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
"version": "1.0.30001658",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
"integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
"dev": true,
"funding": [
{
......@@ -3979,12 +3979,12 @@
"license": "MIT"
},
"node_modules/debug": {
"version": "4.3.6",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/debug/-/debug-4.3.6.tgz",
"integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
"version": "4.3.7",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/debug/-/debug-4.3.7.tgz",
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
"license": "MIT",
"dependencies": {
"ms": "2.1.2"
"ms": "^2.1.3"
},
"engines": {
"node": ">=6.0"
......@@ -4456,9 +4456,9 @@
}
},
"node_modules/electron-to-chromium": {
"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==",
"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==",
"dev": true,
"license": "ISC"
},
......@@ -5016,9 +5016,9 @@
}
},
"node_modules/eslint-module-utils": {
"version": "2.9.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/eslint-module-utils/-/eslint-module-utils-2.9.0.tgz",
"integrity": "sha512-McVbYmwA3NEKwRQY5g4aWMdcZE5xZxV8i8l7CqJSrameuGSQJtSWaL/LxTEzSKKaCcOhlpDR8XEfYXWPrdo/ZQ==",
"version": "2.11.0",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
"integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
"dev": true,
"license": "MIT",
"dependencies": {
......@@ -9176,13 +9176,13 @@
}
},
"node_modules/mailgun-js/node_modules/pac-proxy-agent/node_modules/debug": {
"version": "4.3.6",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/debug/-/debug-4.3.6.tgz",
"integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
"version": "4.3.7",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/debug/-/debug-4.3.7.tgz",
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
"license": "MIT",
"optional": true,
"dependencies": {
"ms": "2.1.2"
"ms": "^2.1.3"
},
"engines": {
"node": ">=6.0"
......@@ -9218,9 +9218,9 @@
}
},
"node_modules/mailgun-js/node_modules/pac-proxy-agent/node_modules/ms": {
"version": "2.1.2",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"version": "2.1.3",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT",
"optional": true
},
......@@ -9793,9 +9793,9 @@
}
},
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"version": "2.1.3",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
"node_modules/murmur-hash-js": {
......@@ -12150,12 +12150,6 @@
"node": ">=4"
}
},
"node_modules/send/node_modules/ms": {
"version": "2.1.3",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
"node_modules/seq-queue": {
"version": "0.0.5",
"resolved": "https://packages.aliyun.com/646341b481b284e28f47a25b/npm/npm-registry/seq-queue/-/seq-queue-0.0.5.tgz",
......
src/functional/mvc/control/mUserOrderPendingAndHistory.control.ts 0 → 100644
View file @ e5f58fee
import * as service from "../service/mUserOrderPendingAndHistory.service";
import { QueryVo } from "../service/mUserOrderPendingAndHistory.service";
import { getCurrentUserId, } from "../../../utils/aclUserUtils";
import { ErrorCode } from "../../../constant/errorCode";
let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert } = require('@madex/ex-js-public');
/**
* 现货当前委托列表
* @param req
* @param infoVO
*/
export const pendingList = async (req: any, queryVo: QueryVo) => {
let func_name = "pendingAndHistoryCtrl.pendingList";
try {
if (!queryVo.user_id) {
throw ErrorCode.PARAM_MISS
}
let res = await service.pendingList(queryVo);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 现货历史委托列表
* @param req
* @param infoVO
*/
export const historyList = async (req: any, queryVo: QueryVo) => {
let func_name = "pendingAndHistoryCtrl.historyList";
try {
if (!queryVo.user_id) {
throw ErrorCode.PARAM_MISS
}
let res = await service.historyList(queryVo);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
src/functional/mvc/control/mUserRealName.control.ts
View file @ e5f58fee
......@@ -71,4 +71,21 @@ export const audit = async (req: any, queryVO: QueryVO) => {
}
};
/**
* Madex 所有审核人员
* @param req
* @param queryVO
*/
export const auditors = async (req: any, queryVO: QueryVO) => {
let func_name = "mUserRealNameCtrl.auditors";
try {
let res = await mUserRealNameService.auditors();
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
src/functional/mvc/service/mUserOrderPendingAndHistory.service.ts 0 → 100644
View file @ e5f58fee
import * as aclPositionService from "../service/aclPosition.service";
import { AclAuthVO, AclAuthPageVO, AclRolePageVO, AclRoleVO } from "../service/aclRoleAuth.service";
import { getCurrentUserId, } from "../../../utils/aclUserUtils";
import { ErrorCode } from "../../../constant/errorCode";
import { getUserOrdersFromCore } from "../../../utils/coreSystemUtils";
let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert } = require('@madex/ex-js-public');
export interface QueryVo {
update_id?: string
is_next?: number//1 下一页
size?: number
user_id?: number
}
export const pendingList = async (queryVo: QueryVo) => {
let param = {
user_id: queryVo.user_id,
status: "unsettled"//当前委托
}
let res = await getUserOrdersFromCore(param);
return res;
};
export const historyList = async (queryVo: QueryVo) => {
let param = {
user_id: queryVo.user_id,
status: "settled"//历史委托
}
let res = await getUserOrdersFromCore(param);
Array.isArray(res);
return res;
};
src/functional/mvc/service/mUserRealName.service.ts
View file @ e5f58fee
import { ormDB, userInfo, userRealName } from "@madex/ex-ts-dao";
import { madAdminOrmDB, aclUserInfo, ormDB, userInfo, userRealName } from "@madex/ex-ts-dao";
import { isLimitUserId, UID_MIN, UID_LIMIT } from "../../../utils/mUserCommonUtils";
import { ErrorCode } from "../../../constant/errorCode";
import * as ossUtils from "../../../utils/OSSUtils";
......@@ -245,6 +245,27 @@ export async function audit(queryVO: QueryVO, currentUserId: any, ip: string | u
return 'success';
}
export async function auditors() {
let auditors = await userRealName.prototype.findAll({
attributes: [ormDB.literal('DISTINCT(auditor) as auditor')],
where: {},
raw: true
});
let where = {};
if (auditors.length) {
where['user_id'] = { [madAdminOrmDB.Op.in]: auditors.map(item => item.auditor) }
}
let resList = await aclUserInfo.prototype.findAll({
attributes: ['user_id', 'account', 'remark'],
where: where,
raw: true
});
return resList;
}
/**
* 根据图片的情况设置缩略图
* @param dbRealNameInfo
......
src/functional/router/v1/index.ts
View file @ e5f58fee
......@@ -28,6 +28,7 @@ import * as commonUserFeeSettingCtrl from "../../mvc/control/commonUserFeeSettin
import * as mUserAssetsCtrl from "../../mvc/control/mUserAssets.control";
import * as departmentCtrl from "../../mvc/control/aclDepartment.control";
import * as positionCtrl from "../../mvc/control/aclPosition.control";
import * as orderPendingAndHistoryCtrl from "../../mvc/control/mUserOrderPendingAndHistory.control";
const getFunc = {
'user/info': userController.getUserInfo,
};
......@@ -114,9 +115,12 @@ const postFunc = {
'mUser/manage/kyc/list': mUserRealNameCtrl.kycList,//Madex 用户管理 ->实名认证列表
'mUser/manage/kyc/oneDetail': mUserRealNameCtrl.oneDetail,//Madex 用户管理 ->kyc详情
'mUser/manage/kyc/audit': mUserRealNameCtrl.audit,//Madex 用户管理 ->kyc审核
'mUser/manage/kyc/auditors': mUserRealNameCtrl.auditors,//Madex 用户管理 -> 所有审核人员
'mUser/manage/walletAsset/detail': mUserAssetsCtrl.walletAssetDetail,//Madex 用户管理 ->钱包账户资产详情
'mUser/manage/asset/distribution': mUserAssetsCtrl.assetDistribution,//Madex 用户管理 ->资产分布
'mUser/manage/tradeAsset/detail': mUserAssetsCtrl.tradeAssetsDetail,//Madex 用户管理 ->交易账户资产详情
'mUser/manage/order/pending/list': orderPendingAndHistoryCtrl.pendingList,//Madex 用户管理 ->当前委托
'mUser/manage/order/history/list': orderPendingAndHistoryCtrl.historyList,//Madex 用户管理 ->历史委托
//资源位管理
'link/useful/list': usefulLinkCtrl.list,//链接记录列表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment