Skip to content

T
ts-api-demo
Commit a5b9e71b authored by ml's avatar ml
Browse files
Options

增加接口、逻辑调整

parent fcf4263f
Hide whitespace changes
Inline Side-by-side
Showing with 803 additions and 148 deletions
src/constant/coinTypeApplyConst.ts 0 → 100644
View file @ a5b9e71b
export const APPLY_STATUS = {
RE_WRITE: 1, // 被驳回
WAIT_VIEW: 2, // 申请待审批
PASS: 3, // 审批通过
CREATE_SYMBOL: 4, // 币种创建完成
TIMER_DEPOSIT: 5, // 充值定时器完成
TIMER_WITHDRAW: 6, // 提现定时器完成
TO_ADMIN: 7, // 增加币种到撮合完成
CANCEL: 8,// 取消
}
\ No newline at end of file
src/constant/errorCode.ts
View file @ a5b9e71b
......@@ -60,5 +60,13 @@ export const ErrorCode = {
COIN_TYPE_NOT_EXIST:'30056',//指定币种不存在
PAIR_NOT_EXIST:'30057',//指定币对不存在
LIMIT_ERROR:'30058',//limit参数必须在10-2000之间
ADD_PAIR_TO_CORE_ERR:'30059',//添加币种/交易对提交到撮合失败
ADD_PAIR_TO_CORE_ERR:'30059',//币种/交易对提交到撮合失败
SUBMIT_STATUS_ERR:'30060',//请确认提交状态
SUBMIT_STATUS_OR_MAIN_ERR:'30061',//提交状态有误/非主币
NOT_EDIT:'30062',//不是被驳回的申请不可以编辑
COIN_DATA_EXIST:'30063',//币种管理中币种已存在
COIN_DATA_NOT_EXIST:'30064',//币种管理中币种不存在
NO_CANCEL:'30065',//审核已通过不允许撤销
DEPOSIT_WITHDRAW_TM_EXPIRE:'30066',//开放充值时间/开放提现时间过短
CURRENT_STATUS_NOT_APPLY:'30067',//当前状态不可以审核
}
src/functional/mvc/control/coinType.control.ts
View file @ a5b9e71b
......@@ -70,12 +70,14 @@ export const update = async (req: any, param: AddParam) => {
}
};
export const pushToCoreSystem = async (req: any, id: any) => {
export const pushToCoreSystem = async (req: any, param: AddParam) => {
let func_name = "coinTypeCtl.pushToCoreSystem";
let cmd = req.path;
try {
ApiAssert.notNull('3000', id);
let res = await service.pushToCoreSystem(id);
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUserId = await getCurrentUserId(req.cookies.session_id);
ApiAssert.notNull('3000', param.id);
let res = await service.pushToCoreSystem(param.id, currentUserId, ip);
return Res3Utils.result(res);
}
catch (e) {
......
src/functional/mvc/control/coinTypeApply.ts 0 → 100644
View file @ a5b9e71b
import * as coinTypeApplyService from "../service/coinTypeApply.service";
import { CoinTypeApplyPageVO, CoinTypeApplyVO } from "../service/coinTypeApply.service";
let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert, datetimeUtils } = require('@madex/ex-js-public');
import { ErrorCode } from "../../../constant/errorCode";
import { getCurrentUser, getCurrentUserId } from "../../../utils/aclUserUtils";
let isIp = require('is-ip');
/**
* 技术部-上币管理-上币申请-申请上新币列表
* @param req
* @param infoVO
*/
export const list = async (req: any, pageVO: CoinTypeApplyPageVO) => {
let func_name = "coinTypeApply.control.list";
try {
pageVO.page = Optional.opt(pageVO, 'page', 1);
pageVO.size = Optional.opt(pageVO, 'size', 20);
let res = await coinTypeApplyService.list(pageVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-已有币种列表
* @param req
* @param infoVO
*/
export const listed = async (req: any, pageVO: CoinTypeApplyPageVO) => {
let func_name = "coinTypeApply.control.listed";
try {
pageVO.page = Optional.opt(pageVO, 'page', 1);
pageVO.size = Optional.opt(pageVO, 'size', 20);
let res = await coinTypeApplyService.listed(pageVO);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-交易浏览器列表
* @param req
* @param infoVO
*/
export const exploreUrlList = async (req: any, pageVO: CoinTypeApplyPageVO) => {
let func_name = "coinTypeApply.control.exploreUrlList";
try {
let res = await coinTypeApplyService.exploreUrlList();
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-申请上新币
* @param req
* @param authConfigVO
*/
export const apply = async (req: any, coinTypeApplyVO: CoinTypeApplyVO) => {
let func_name = "coinTypeApply.control.apply";
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUser = await getCurrentUser(req.cookies.session_id);
await paramValid(coinTypeApplyVO);
let res = await coinTypeApplyService.apply(coinTypeApplyVO, currentUser, ip);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-编辑上新币
* @param req
* @param authConfigVO
*/
export const edit = async (req: any, coinTypeApplyVO: CoinTypeApplyVO) => {
let func_name = "coinTypeApply.control.edit";
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUser = await getCurrentUser(req.cookies.session_id);
if (!coinTypeApplyVO.id) {
throw ErrorCode.PARAM_MISS
}
await paramValid(coinTypeApplyVO);
let res = await coinTypeApplyService.edit(coinTypeApplyVO, currentUser, ip);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-撤销申请上币
* @param req
* @param authConfigVO
*/
export const cancelSelf = async (req: any, coinTypeApplyVO: CoinTypeApplyVO) => {
let func_name = "coinTypeApply.control.cancelSelf";
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUser = await getCurrentUser(req.cookies.session_id);
if (!coinTypeApplyVO.id) {
throw ErrorCode.PARAM_MISS
}
let res = await coinTypeApplyService.cancelSelf(coinTypeApplyVO.id, coinTypeApplyVO.reason, currentUser, ip);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-驳回申请上币
* @param req
* @param authConfigVO
*/
export const rewrite = async (req: any, coinTypeApplyVO: CoinTypeApplyVO) => {
let func_name = "coinTypeApply.control.rewrite";
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUser = await getCurrentUser(req.cookies.session_id);
if (!coinTypeApplyVO.id) {
throw ErrorCode.PARAM_MISS
}
let res = await coinTypeApplyService.rewrite(coinTypeApplyVO.id, coinTypeApplyVO.reason, currentUser, ip);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-管理员取消申请上新币
* @param req
* @param authConfigVO
*/
export const cancel = async (req: any, coinTypeApplyVO: CoinTypeApplyVO) => {
let func_name = "coinTypeApply.control.cancel";
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUser = await getCurrentUser(req.cookies.session_id);
if (!coinTypeApplyVO.id) {
throw ErrorCode.PARAM_MISS
}
let res = await coinTypeApplyService.cancel(coinTypeApplyVO.id, coinTypeApplyVO.reason, currentUser, ip);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
/**
* 技术部-上币管理-上币申请-审核申请上新币
* @param req
* @param authConfigVO
*/
export const review = async (req: any, coinTypeApplyVO: CoinTypeApplyVO) => {
let func_name = "coinTypeApply.control.review";
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUser = await getCurrentUser(req.cookies.session_id);
if (!coinTypeApplyVO.id) {
throw ErrorCode.PARAM_MISS
}
let res = await coinTypeApplyService.review(coinTypeApplyVO.id, currentUser, ip);
return Res3Utils.result(res);
}
catch (e) {
logger.error(`${func_name} error:${e}`);
return Res3Utils.getErrorResult(e);
}
};
async function paramValid(coinTypeApplyVO: CoinTypeApplyVO) {
if (!coinTypeApplyVO.symbol || !coinTypeApplyVO.name
|| !coinTypeApplyVO.original_decimals || !coinTypeApplyVO.valid_decimals
|| !coinTypeApplyVO.deposit_confirm_count || !coinTypeApplyVO.safe_confirm_count
|| !coinTypeApplyVO.withdraw_fee || !coinTypeApplyVO.withdraw_min || !coinTypeApplyVO.max_transfer_amount) {
throw ErrorCode.PARAM_MISS;
}
if (!coinTypeApplyVO.is_erc20) {
coinTypeApplyVO.is_erc20 = 0
}
let tm = datetimeUtils.add(new Date(), datetimeUtils.SECONED * 10);
if (!coinTypeApplyVO.tm_enable_deposit
|| datetimeUtils.between(coinTypeApplyVO.tm_enable_deposit, tm) < 0) {
throw ErrorCode.PARAM_MISS;
}
if (!coinTypeApplyVO.tm_enable_withdraw
|| datetimeUtils.between(coinTypeApplyVO.tm_enable_withdraw, tm) < 0) {
throw ErrorCode.PARAM_MISS;
}
}
src/functional/mvc/control/commonUserFeeSetting.control.ts
View file @ a5b9e71b
......@@ -219,8 +219,8 @@ async function updateParamValid(commonUserFeeVO: CommonUserFeeVO) {
*/
async function paramCheck(beginTime: any, expireTime: any, type: number, userId: number) {
//结束时间最少需要是一小时后；开始时间和结束时间最少需要间隔一小时
if (!datetimeUtils.between(expireTime, new Date()) > datetimeUtils.HOUR
|| !datetimeUtils.between(expireTime, beginTime) > datetimeUtils.HOUR) {
if (datetimeUtils.between(expireTime, new Date()) < datetimeUtils.HOUR
|| datetimeUtils.between(expireTime, beginTime) < datetimeUtils.HOUR) {
throw ErrorCode.PARAM_MISS;
}
if (isNaN(Number(type)) || !FEE_TYPE_LIST.includes(Number(type))) {
......
src/functional/mvc/control/spotPair.control.ts
View file @ a5b9e71b
......@@ -60,13 +60,15 @@ export const update = async (req: any, param: AddParam) => {
}
};
export const pushToCoreSystem = async (req: any, id: any) => {
//提交到撮合
export const pushToCoreSystem = async (req: any, param: AddParam) => {
let func_name = "spotPairCtl.pushToCoreSystem";
let cmd = req.path;
try {
ApiAssert.notNull('3000', id);
let res = await service.pushToCoreSystem(id);
ApiAssert.notNull('3000', param.id);
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUserId = await getCurrentUserId(req.cookies.session_id);
let res = await service.pushToCoreSystem(param.id, currentUserId, ip);
return Res3Utils.result(res);
}
catch (e) {
......
src/functional/mvc/service/aclUser.service.ts
View file @ a5b9e71b
......@@ -70,10 +70,11 @@ export interface AclUserInfoPageVO extends AclUserInfoVO {
export const list = async (aclUserInfoPageVO: AclUserInfoPageVO) => {
let where = {}
if (!aclUserInfoPageVO.account) {
where = {};
where = { del_flag: 0 };
}
else if (!isNaN(Number(aclUserInfoPageVO.account))) {
where = {
del_flag: 0,
[madAdminOrmDB.Op.or]: {
user_id: Number(aclUserInfoPageVO.account),
account: { [madAdminOrmDB.Op.like]: `${aclUserInfoPageVO.account}%` },
......@@ -83,6 +84,7 @@ export const list = async (aclUserInfoPageVO: AclUserInfoPageVO) => {
}
else {
where = {
del_flag: 0,
[madAdminOrmDB.Op.or]: {
account: { [madAdminOrmDB.Op.like]: `${aclUserInfoPageVO.account}%` },
email: { [madAdminOrmDB.Op.like]: `${aclUserInfoPageVO.account}%` },
......@@ -215,7 +217,7 @@ export const update = async (aclUserInfoVO: AclUserInfoVO, session_id: any) => {
if (aclUserInfoVO.allow_ips != dbInfo.allow_ips) {
updateInfo['allow_ips'] = aclUserInfoVO.allow_ips
}
if ( aclUserInfoVO.pwd && aclUserInfoVO.pwd != dbInfo.pwd) {
if (aclUserInfoVO.pwd && aclUserInfoVO.pwd != dbInfo.pwd) {
let encrypted = await AuthCommon.getPasswordEncrypt(aclUserInfoVO.pwd, dbInfo.pwd_salt);
updateInfo['pwd'] = encrypted;
updateInfo['pwd_status'] = 1;
......@@ -226,6 +228,9 @@ export const update = async (aclUserInfoVO: AclUserInfoVO, session_id: any) => {
if (aclUserInfoVO.totp_encrypt != dbInfo.totp_encrypt) {
updateInfo['totp_encrypt'] = aclUserInfoVO.totp_encrypt
}
if (aclUserInfoVO.del_flag != dbInfo.del_flag) {
updateInfo['del_flag'] = aclUserInfoVO.del_flag
}
let tx;
......@@ -365,7 +370,7 @@ export const optLogList = async (aclUserInfoPageVO: AclUserInfoPageVO) => {
module: { [madAdminOrmDB.Op.like]: `%${aclUserInfoPageVO.condition}%` },
}
}
if (aclUserInfoPageVO.from_time && aclUserInfoPageVO.to_time){
if (aclUserInfoPageVO.from_time && aclUserInfoPageVO.to_time) {
where['createdAt'] = { [ormDB.Op.between]: [aclUserInfoPageVO.from_time, aclUserInfoPageVO.to_time] }
}
......
src/functional/mvc/service/coinType.service.ts
View file @ a5b9e71b
......@@ -126,34 +126,7 @@ export async function list(param: ListParam) {
export const save = async (param: AddParam, currentUserId: any, ip: any) => {
param.updatedAt = new Date();
param.createdAt = new Date();
let tx;
try {
tx = await ormDB.transaction();
let insertInfo = await coinType.prototype.create(param, {
transaction: tx
});
//TODO:目前方便调试先注释掉，之后正式测试时候需要解开注释
/*//提交到撮合
if (param.is_main) {
let optResult = await addCoin2Core(insertInfo.general_name, insertInfo.id);
if (!optResult) {
throw ErrorCode.ADD_PAIR_TO_CORE_ERR;
}
await coinType.prototype.update({ main_status: 1 }, {
where: {
id: insertInfo.id
}
})
}*/
await tx.commit();
}
catch (e) {
logger.error('coinTypeService.save.error:' + e);
if (tx) {
await tx.rollback();
}
throw e;
}
await coinType.prototype.create(param);
//管理后台操作日志
addOptLog(currentUserId, 0, '币种管理新增', ip, JSON.stringify(param), '币种管理');
return 'ok';
......@@ -179,23 +152,29 @@ export const update = async (param: AddParam, currentUserId: any, ip: any) => {
return 'ok';
};
export const pushToCoreSystem = async (id: any) => {
export const pushToCoreSystem = async (id: any, currentUserId: any, ip: any) => {
let where = { id: id, main_status: 0, is_main: 1 };
let cfg = await coinType.prototype.find({
where: where, raw: true
});
if (cfg) {
let symbol = cfg.general_name;
let optResult = await addCoin2Core(symbol, cfg.id);
if (optResult) {
await coinType.prototype.update({ main_status: 1 }, {
where: where
})
}
if (!cfg) {
throw ErrorCode.SUBMIT_STATUS_OR_MAIN_ERR;
}
let symbol = cfg.general_name;
let optResult = await addCoin2Core(symbol, cfg.id);
if (!optResult.is_success) {
//管理后台操作日志
addOptLog(currentUserId, 0, '提交币种到撮合-失败', ip, `symbol:${symbol},error_msg:${optResult.err_msg}`, '币种管理');
throw ErrorCode.ADD_PAIR_TO_CORE_ERR;
}
await coinType.prototype.update({ main_status: 1 }, {
where: where
});
//管理后台操作日志
addOptLog(currentUserId, 0, '提交币种到撮合-成功', ip, `symbol:${symbol}`, '币种管理');
return 'ok';
};
......
src/functional/mvc/service/coinTypeApply.service.ts 0 → 100644
View file @ a5b9e71b
import { coinTypeApply, coinType, ormDB, systemTrigger } from "@madex/ex-ts-dao";
import { ErrorCode } from "../../../constant/errorCode";
import { addOptLog } from "./userOptLog.service";
import { APPLY_STATUS } from "../../../constant/coinTypeApplyConst";
import { addCoin2Core } from "../../../utils/coreSystemUtils";
let _ = require('lodash');
let { logger, datetimeUtils } = require('@madex/ex-js-public');
export interface CoinTypeApplyVO {
id?: number;
symbol?: string;
name?: string;
forbid_info?: string;
explor_url?: string;
icon_url?: string;
describe_url?: string;
original_decimals?: number;
valid_decimals?: number;
is_erc20?: number;
contract?: string;
contract_father?: string;
deposit_confirm_count?: number;
safe_confirm_count?: number;
withdraw_fee?: string;
withdraw_min?: string;
tm_enable_deposit?: Date | any,
tm_enable_withdraw?: Date | any,
applyer?: number;
checker?: number;
status?: number;
reason?: string;
max_transfer_amount?: string;
createdAt?: Date | any,
updatedAt?: Date | any,
}
export interface CoinTypeApplyPageVO extends CoinTypeApplyVO {
page?: number,
size?: number,
}
export async function list(pageVO: CoinTypeApplyPageVO) {
let resList = await coinTypeApply.prototype.findAndCount({
limit: pageVO.size,
offset: (Number(pageVO.page) - 1) * Number(pageVO.size),
order: [['status', 'asc'], ["id", "desc"]],
raw: true
});
return resList;
}
export async function listed(pageVO: CoinTypeApplyPageVO) {
let where = {};
if (pageVO.symbol) {
where['symbol'] = pageVO.symbol;
}
let resList = await coinType.prototype.findAndCount({
where: where,
limit: pageVO.size,
offset: (Number(pageVO.page) - 1) * Number(pageVO.size),
order: [["id", "desc"]],
raw: true
});
return resList;
}
export async function exploreUrlList() {
let dbList = await coinType.prototype.findAll({
attributes: ['explor_url'],
where: {
explor_url: { [ormDB.Op.ne]: "" }
},
raw: true
});
let resList = dbList.map(item => item.explor_url);
return resList;
}
export async function apply(coinTypeApplyVO: CoinTypeApplyVO, currentUser: any, ip: string | undefined) {
let dbSymbol = await coinType.prototype.findOne({
where: { symbol: coinTypeApplyVO.symbol },
raw: true
});
if (dbSymbol) {
throw ErrorCode.COIN_DATA_EXIST;
}
coinTypeApplyVO.applyer = currentUser.account;
coinTypeApplyVO.status = APPLY_STATUS.WAIT_VIEW;
coinTypeApplyVO.createdAt = new Date();
coinTypeApplyVO.updatedAt = new Date();
if (Number(coinTypeApplyVO.id) > 0) {//update
let dbApply = await coinTypeApply.prototype.findOne({
where: { id: coinTypeApplyVO.id },
raw: true
});
if (!dbApply) {
throw ErrorCode.DATA_NOT_EXIST;
}
if (dbApply.status != APPLY_STATUS.RE_WRITE) {
throw ErrorCode.NOT_EDIT
}
await coinTypeApply.prototype.update(coinTypeApplyVO, {
where: {
id: Number(coinTypeApplyVO.id)
}
});
}
else {
await coinTypeApply.prototype.create(coinTypeApplyVO);
}
sendMsg(coinTypeApplyVO.status, String(coinTypeApplyVO.symbol));
//管理后台操作日志
addOptLog(currentUser.userId, 0, '新增上币申请', ip, JSON.stringify(coinTypeApplyVO), '上币管理');
return 'success';
}
export async function edit(coinTypeApplyVO: CoinTypeApplyVO, currentUser: any, ip: string | undefined) {
let dbSymbol = await coinType.prototype.findOne({
where: { symbol: coinTypeApplyVO.symbol },
raw: true
});
if (dbSymbol) {
throw ErrorCode.COIN_DATA_EXIST;
}
let dbApply = await coinTypeApply.prototype.findOne({
where: { id: coinTypeApplyVO.id },
raw: true
});
if (!dbApply) {
throw ErrorCode.DATA_NOT_EXIST;
}
if (Number(coinTypeApplyVO.status) < APPLY_STATUS.CREATE_SYMBOL) {
if (dbSymbol) {
throw ErrorCode.COIN_DATA_EXIST;
}
}
else if (dbSymbol) {
throw ErrorCode.COIN_DATA_NOT_EXIST
}
coinTypeApplyVO.applyer = dbApply.applyer;
coinTypeApplyVO.updatedAt = new Date();
await coinTypeApply.prototype.update(coinTypeApplyVO, {
where: {
id: Number(coinTypeApplyVO.id)
}
});
sendMsg(Number(coinTypeApplyVO.status), String(coinTypeApplyVO.symbol));
//管理后台操作日志
addOptLog(currentUser.userId, 0, '上币申请编辑', ip, JSON.stringify(coinTypeApplyVO), '上币管理');
return 'success';
}
export async function cancelSelf(id: any, reason: any, currentUser: any, ip: string | undefined) {
let dbApply = await coinTypeApply.prototype.findOne({
where: { id: id },
raw: true
});
if (!dbApply) {
throw ErrorCode.DATA_NOT_EXIST;
}
if (dbApply.status >= APPLY_STATUS.PASS) {
throw ErrorCode.NO_CANCEL;
}
await updateApply(Number(id), APPLY_STATUS.CANCEL, currentUser.account, String(reason), dbApply.symbol);
//管理后台操作日志
addOptLog(currentUser.userId, 0, '撤销上币申请', ip, JSON.stringify(dbApply), '上币管理');
return 'success';
}
export async function rewrite(id: any, reason: any, currentUser: any, ip: string | undefined) {
let dbApply = await coinTypeApply.prototype.findOne({
where: { id: id },
raw: true
});
if (!dbApply) {
throw ErrorCode.DATA_NOT_EXIST;
}
await updateApply(Number(id), APPLY_STATUS.RE_WRITE, currentUser.account, String(reason), dbApply.symbol);
//管理后台操作日志
addOptLog(currentUser.userId, 0, '驳回上币申请', ip, JSON.stringify(dbApply), '上币管理');
return 'success';
}
export async function cancel(id: any, reason: any, currentUser: any, ip: string | undefined) {
let dbApply = await coinTypeApply.prototype.findOne({
where: { id: id },
raw: true
});
if (!dbApply) {
throw ErrorCode.DATA_NOT_EXIST;
}
await updateApply(Number(id), APPLY_STATUS.CANCEL, currentUser.account, String(reason), dbApply.symbol);
//管理后台操作日志
addOptLog(currentUser.userId, 0, '管理员取消上币申请', ip, JSON.stringify(dbApply), '上币管理');
return 'success';
}
export async function review(id: any, currentUser: any, ip: string | undefined) {
let dbApply = await coinTypeApply.prototype.findOne({
where: { id: id },
raw: true
});
if (!dbApply) {
throw ErrorCode.DATA_NOT_EXIST;
}
let reason = "";
//1被驳回 2申请待审批 3审批通过 4币种创建完成 5充值定时器完成 6提现定时器完成 7增加币种到撮合完成 8取消
let status = Number(dbApply.status)
if (status == APPLY_STATUS.WAIT_VIEW) {//2-3
reason = "审核通过";
await updateApply(Number(id), APPLY_STATUS.PASS, currentUser.account, reason, dbApply.symbol);
}
else if (status == APPLY_STATUS.PASS) {//3-4
let dbSymbol = await coinType.prototype.findOne({
where: { symbol: dbApply.symbol },
raw: true
});
if (dbSymbol) {
throw ErrorCode.COIN_DATA_EXIST;
}
let insertInfo = {
symbol: dbApply.symbol,
is_active: 1,
is_main: 1,
name: dbApply.name,
general_name: dbApply.name,
original_decimals: dbApply.original_decimals,
valid_decimals: dbApply.valid_decimals,
is_erc20: dbApply.is_erc20,
contract: dbApply.contract,
contract_father: dbApply.contract_father,
deposit_confirm_count: dbApply.deposit_confirm_count,
safe_confirm_count: dbApply.safe_confirm_count,
withdraw_fee: dbApply.withdraw_fee,
withdraw_min: dbApply.withdraw_min,
icon_url: dbApply.icon_url,
explor_url: dbApply.explor_url,
describe_url: dbApply.describe_url,
forbid_info: dbApply.forbid_info,
enable_deposit: 0,
enable_withdraw: 0,
main_status: 0,
createdAt: new Date(),
updatedAt: new Date(),
}
await coinType.prototype.create(insertInfo);
reason = "币种创建完成";
await updateApply(Number(id), APPLY_STATUS.CREATE_SYMBOL, currentUser.account, reason, dbApply.symbol);
}
else if (status == APPLY_STATUS.CREATE_SYMBOL) {//4-5
let dbSymbol = await coinType.prototype.findOne({
where: { symbol: dbApply.symbol },
raw: true
});
if (!dbSymbol) {
throw ErrorCode.COIN_DATA_NOT_EXIST;
}
let tm = datetimeUtils.add(new Date(), datetimeUtils.SECONED);
let tm_enable_deposit = dbApply.tm_enable_deposit;
if (datetimeUtils.between(tm_enable_deposit, tm) < 0) {
throw ErrorCode.DEPOSIT_WITHDRAW_TM_EXPIRE;
}
if (dbSymbol.enable_deposit === 0) {
await systemTrigger.prototype.create({
trigger_symbol: dbApply.symbol,
trigger_type: 1,
trigger_action: 1021,
trigger_time: tm_enable_deposit,
status: 0,
createdAt: new Date(),
updatedAt: new Date(),
});
}
reason = "充值定时器完成";
await updateApply(Number(id), APPLY_STATUS.TIMER_DEPOSIT, currentUser.account, reason, dbApply.symbol);
}
else if (status == APPLY_STATUS.TIMER_DEPOSIT) {//5-6
let dbSymbol = await coinType.prototype.findOne({
where: { symbol: dbApply.symbol },
raw: true
});
if (!dbSymbol) {
throw ErrorCode.COIN_DATA_NOT_EXIST;
}
let tm = datetimeUtils.add(new Date(), datetimeUtils.SECONED);
let tm_enable_withdraw = dbApply.tm_enable_withdraw;
if (datetimeUtils.between(tm_enable_withdraw, tm) < 0) {
throw ErrorCode.DEPOSIT_WITHDRAW_TM_EXPIRE;
}
if (dbSymbol.enable_deposit === 0) {
await systemTrigger.prototype.create({
trigger_symbol: dbApply.symbol,
trigger_type: 1,
trigger_action: 1031,
trigger_time: tm_enable_withdraw,
status: 0,
createdAt: new Date(),
updatedAt: new Date(),
});
}
reason = "提现定时器完成";
await updateApply(Number(id), APPLY_STATUS.TIMER_WITHDRAW, currentUser.account, reason, dbApply.symbol);
}
else if (status == APPLY_STATUS.TIMER_WITHDRAW) {//6-7
let dbSymbol = await coinType.prototype.findOne({
where: { symbol: dbApply.symbol },
raw: true
});
if (!dbSymbol) {
throw ErrorCode.COIN_DATA_NOT_EXIST;
}
let res = await addCoin2Core(dbSymbol.symbol, dbSymbol.id);
if (!res.is_success) {
throw ErrorCode.ADD_PAIR_TO_CORE_ERR;
}
reason = "增加币种到撮合完成";
await updateApply(Number(id), APPLY_STATUS.TO_ADMIN, currentUser.account, reason, dbApply.symbol);
}
else {
throw ErrorCode.CURRENT_STATUS_NOT_APPLY
}
//管理后台操作日志
addOptLog(currentUser.userId, 0, '上币申请审核', ip, `msg:${reason},dbInfo:${JSON.stringify(dbApply)}`, '上币管理');
return 'success';
}
async function updateApply(id: number, status: number, checker: string, reason: string, symbol: string) {
let updateInfo = {
status: status,
checker: checker,
reason: reason ? reason : "",
updatedAt: new Date()
}
await coinTypeApply.prototype.update(updateInfo, {
where: {
id: id
}
});
sendMsg(status, symbol);
}
//TODO:发送lark消息
async function sendMsg(status: number, symbol: string) {
let content = "";
if (status == APPLY_STATUS.RE_WRITE) {
content = "申请上币,被驳回：" + symbol;
}
else if (status == APPLY_STATUS.WAIT_VIEW) {
content = "申请上币：" + symbol;
}
else if (status == APPLY_STATUS.PASS) {
content = "申请上币,审批通过：" + symbol + "，下一步币种创建";
}
else if (status == APPLY_STATUS.CREATE_SYMBOL) {
content = "申请上币,币种创建完成：" + symbol + "，下一步充值定时器";
}
else if (status == APPLY_STATUS.TIMER_DEPOSIT) {
content = "申请上币,充值定时器完成：" + symbol + "，下一步提现定时器";
}
else if (status == APPLY_STATUS.TIMER_WITHDRAW) {
content = "申请上币,提现定时器完成：" + symbol + "，下一步增加币种到撮合";
}
else if (status == APPLY_STATUS.TO_ADMIN) {
content = "申请上币,增加币种到撮合完成：" + symbol + "，流程结束";
}
else if (status == APPLY_STATUS.CANCEL) {
content = "申请上币,被取消：" + symbol + "，流程结束";
}
if (content) {
//TODO:发lark
}
}
src/functional/mvc/service/commonUserFeeSetting.service.ts
View file @ a5b9e71b
......@@ -74,6 +74,9 @@ export async function list(pageVO: CommonUserFeePageVO) {
if (pageVO.export) {
let resList = await commonUserFeeSetting.prototype.findAll({
where: {
status: { [ormDB.Op.ne]: 4 }
},
order: [['id', 'desc']],
raw: true
});
......@@ -83,6 +86,7 @@ export async function list(pageVO: CommonUserFeePageVO) {
if (pageVO.user_id) {
where.user_id = pageVO.user_id;
}
where.status = { [ormDB.Op.ne]: 4 };
if (pageVO.type) {
where.type = pageVO.type;
}
......
src/functional/mvc/service/spotPair.service.ts
View file @ a5b9e71b
......@@ -80,46 +80,8 @@ export async function list(param: ListParam) {
export const save = async (param: AddParam, currentUserId: any, ip: any) => {
param.updatedAt = new Date();
param.createdAt = new Date();
let tx;
try {
tx = await madSpotOrmDB.transaction();
//数据库新增
let insertInfo = await spotPairs.prototype.create(param, {
transaction: tx
});
//TODO:目前方便调试先注释掉，之后正式测试时候需要解开注释
/*//提交到撮合
let symbol = insertInfo.symbol;
let sps = symbol.split("_");
let base = sps[0];
let quote = sps[1]
let toCoreParam = {
"base": base, "quote": quote, "symbol": symbol, "name": symbol,
"price_scale": insertInfo.price_scale, "quantity_scale": insertInfo.quantity_scale,
"maker_fee": insertInfo.maker_fee, "taker_fee": insertInfo.taker_fee
}
let optResult = await addPairToCore(toCoreParam);
if (!optResult) {
throw ErrorCode.ADD_PAIR_TO_CORE_ERR;
}
if (!insertInfo.id) {
throw ErrorCode.DATA_NOT_EXIST
}
await spotPairs.prototype.update({ status: 1 }, {
where: {
id: insertInfo.id
},
transaction: tx
});*/
await tx.commit();
}
catch (e) {
logger.error('spotPairService.save.error:' + e);
if (tx) {
await tx.rollback();
}
throw e;
}
await spotPairs.prototype.create(param);
//管理后台操作日志
addOptLog(currentUserId, 0, '交易对配置新增', ip, JSON.stringify(param), '交易对配置');
return 'ok';
......@@ -157,30 +119,36 @@ export const update = async (param: AddParam, currentUserId: any, ip: any) => {
return 'ok';
};
export const pushToCoreSystem = async (id: any) => {
export const pushToCoreSystem = async (id: any, currentUserId: any, ip: any) => {
let where = { id: id, status: 0 };
let cfg = await spotPairs.prototype.find({
where: where, raw: true
});
if (cfg) {
let symbol = cfg.symbol;
let sps = symbol.split("_");
let base = sps[0];
let quote = sps[1]
let param = {
"base": base, "quote": quote, "symbol": symbol, "name": symbol,
"price_scale": cfg.price_scale, "quantity_scale": cfg.quantity_scale,
"maker_fee": cfg.maker_fee, "taker_fee": cfg.taker_fee
}
let optResult = await addPairToCore(param);
if (optResult) {
await spotPairs.prototype.update({ status: 1 }, {
where: where
});
}
if (!cfg) {
throw ErrorCode.SUBMIT_STATUS_ERR;
}
let symbol = cfg.symbol;
let sps = symbol.split("_");
let base = sps[0];
let quote = sps[1]
let param = {
"base": base, "quote": quote, "symbol": symbol, "name": symbol,
"price_scale": cfg.price_scale, "quantity_scale": cfg.quantity_scale,
"maker_fee": cfg.maker_fee, "taker_fee": cfg.taker_fee
}
let optResult = await addPairToCore(param);
if (!optResult.is_success) {
//管理后台操作日志
addOptLog(currentUserId, 0, '提交交易对到撮合-失败', ip, `pair:${symbol},error_msg:${optResult.err_msg}`, '交易对配置');
throw ErrorCode.ADD_PAIR_TO_CORE_ERR;
}
await spotPairs.prototype.update({ status: 1 }, {
where: where
});
//管理后台操作日志
addOptLog(currentUserId, 0, '提交交易对到撮合-成功', ip, JSON.stringify(param), '交易对配置');
return 'ok';
};
......
src/functional/router/v1/index.ts
View file @ a5b9e71b
......@@ -42,6 +42,7 @@ import * as contractMarketMakerCtrl from "../../mvc/control/contractMarketMaker.
import * as contractLimitTradeCtrl from "../../mvc/control/contractLimitTrade.control";
import * as contractAgentCtrl from "../../mvc/control/contractAgent.control";
import * as depositAndWithdrawCtrl from "../../mvc/control/depositAndWithdraw.control";
import * as coinTypeApplyCtrl from "../../mvc/control/coinTypeApply";
const getFunc = {
'user/info': userController.getUserInfo,
......@@ -224,6 +225,17 @@ const postFunc = {
'custom/fund/deposit/record/list': depositAndWithdrawCtrl.depositList,
//客服部-资金管理-提现管理
'custom/fund/withdraw/record/list': depositAndWithdrawCtrl.withdrawList,
//技术部-上币管理-上币申请
'tech/apply/new/coin/list': coinTypeApplyCtrl.list,//申请上新币列表
'tech/apply/new/coin/apply': coinTypeApplyCtrl.apply,//申请上新币
'tech/apply/new/coin/apply/cancel/self': coinTypeApplyCtrl.cancelSelf,//撤销申请上新币
'tech/apply/new/coin/apply/edit': coinTypeApplyCtrl.edit,//编辑申请上新币
'tech/apply/new/coin/apply/review': coinTypeApplyCtrl.review,//审核申请上新币
'tech/apply/new/coin/apply/rewrite': coinTypeApplyCtrl.rewrite,//驳回申请上新币
'tech/apply/new/coin/apply/cancel': coinTypeApplyCtrl.cancel,//管理员取消申请上新币
'tech/apply/new/coin/explore/url/list': coinTypeApplyCtrl.exploreUrlList,//交易浏览器列表
'tech/apply/new/coin/listed': coinTypeApplyCtrl.listed,//已有币种列表
};
// TODO 这里先和 nodejs 的注册路由方式保持一样，后面在调整。
......
src/setting/access-limit.ts
View file @ a5b9e71b
......@@ -175,6 +175,16 @@ let cmdWhiteList = {
'custom/fund/deposit/record/list': 1,
//客服部-资金管理-提现管理
'custom/fund/withdraw/record/list': 1,
//技术部-上币管理-上币申请
'tech/apply/new/coin/list': 1,
'tech/apply/new/coin/apply': 1,
'tech/apply/new/coin/apply/cancel/self': 1,
'tech/apply/new/coin/apply/edit': 1,
'tech/apply/new/coin/apply/review': 1,
'tech/apply/new/coin/apply/rewrite': 1,
'tech/apply/new/coin/apply/cancel': 1,
'tech/apply/new/coin/explore/url/list': 1,
'tech/apply/new/coin/listed': 1,
};
......
src/utils/coreSystemUtils.ts
View file @ a5b9e71b
......@@ -3,16 +3,17 @@ import { coinType } from "@madex/ex-ts-dao";
const axios = require("axios");
const _ = require("lodash");
import configSetting from "./../../config"
import configSetting from "./../../config"
const webadmin_endpoint = configSetting.webadmin_endpoint
let { logger } = require('@madex/ex-js-public');
// { id: 1, symbol: 'BTC' }
export const getCoinFromCore = async(symbol)=> {
export const getCoinFromCore = async (symbol) => {
const url = `${webadmin_endpoint}/asset/by_symbol?symbol=${symbol}`
let { data } = await axios.get(url);
if (data.state!=0) {
logger.error("getCoinFromCore",data.msg);
if (data.state != 0) {
logger.error("getCoinFromCore", data.msg);
return null
}
return data.result[0];
......@@ -26,11 +27,11 @@ export const getCoinFromCore = async(symbol)=> {
// 'quantity-scale': 2,
// 'quantity-increment': '0'
// }
export const getPairFromCore = async(symbol,market="spot")=> {
export const getPairFromCore = async (symbol, market = "spot") => {
const url = `${webadmin_endpoint}/pair/by_symbol?symbol=${symbol}&market=${market}`
let { data } = await axios.get(url);
if (data.state!=0) {
logger.error("getPairFromCore",data.msg);
if (data.state != 0) {
logger.error("getPairFromCore", data.msg);
return null
}
return data.result[0]
......@@ -38,27 +39,27 @@ export const getPairFromCore = async(symbol,market="spot")=> {
// res：
// [{"name":"BTC","asset":1,"balance":"10","holds":"0"}]
export const getUserAccountFromCore = async(userId,withName = true)=> {
export const getUserAccountFromCore = async (userId, withName = true) => {
const url = `${webadmin_endpoint}/account/list?user_id=${userId}`
let { data } = await axios.get(url);
if (data.state!=0) {
logger.error("getPairFromCore",data.msg);
if (data.state != 0) {
logger.error("getUserAccountFromCore", data.msg);
return null
}
let assets= data.result
let assets = data.result
let asset_id = _.map(assets,'asset');
let asset_id = _.map(assets, 'asset');
if (withName) {
let names = await coinType.prototype.findAll({
attributes:['general_name','asset_id'],
where:{
attributes: ['general_name', 'asset_id'],
where: {
asset_id,
is_main:1
is_main: 1
},
raw:true
raw: true
})
let m = _.keyBy(names,'asset_id');
let m = _.keyBy(names, 'asset_id');
for (const item of assets) {
if (m[item.asset]) {
item.name = m[item.asset].general_name
......@@ -79,12 +80,12 @@ export const getUserAccountFromCore = async(userId,withName = true)=> {
// limit, / 数量
// res:
// [{"orderId":"4611689316962271233","clientOrderId":"","createTime":"1725261917795","product":"BTC_USDT","type":1,"side":"buy","quantity":"1","stf":"disabled","price":"9999.0000","visibleQty":"1","timeInForce":"gtc","cancelAfter":0,"postOnly":false,"status":"accepted","executedQty":"0","fillCount":0,"fills":[],"fees":[],"updateTime":"1725261917795"},{"orderId":"4611689316962271234","clientOrderId":"","createTime":"1725261919337","product":"BTC_USDT","type":1,"side":"buy","quantity":"1","stf":"disabled","price":"9998.0000","visibleQty":"1","timeInForce":"gtc","cancelAfter":0,"postOnly":false,"status":"accepted","executedQty":"0","fillCount":0,"fills":[],"fees":[],"updateTime":"1725261919337"}]
export const getUserOrdersFromCore = async(params)=> {
export const getUserOrdersFromCore = async (params) => {
// let params = new URLSearchParams();
const url = `${webadmin_endpoint}/order/list`
let { data } = await axios.get(url,{params});
if (data.state!=0) {
logger.error("getPairFromCore",data.msg);
let { data } = await axios.get(url, { params });
if (data.state != 0) {
logger.error("getUserOrdersFromCore", data.msg);
return null
}
return data.result
......@@ -98,12 +99,12 @@ export const getUserOrdersFromCore = async(params)=> {
// after, // update_id
// limit, / 数量
// order_id 可选
export const getUserFillsFromCore = async(params)=> {
export const getUserFillsFromCore = async (params) => {
// let params = new URLSearchParams();
const url = `${webadmin_endpoint}/fill/list`
let { data } = await axios.get(url,{params});
if (data.state!=0) {
logger.error("getUserFillsFromCore",data.msg);
let { data } = await axios.get(url, { params });
if (data.state != 0) {
logger.error("getUserFillsFromCore", data.msg);
return null
}
return data.result
......@@ -112,27 +113,37 @@ export const getUserFillsFromCore = async(params)=> {
// getUserOrdersFromCore({user_id:1})
export const addCoin2Core = async(symbol,id)=> {
export const addCoin2Core = async (symbol, id) => {
let res = {
is_success: true,
err_msg: ""
}
const url = `${webadmin_endpoint}/asset/add`
let body = {
"symbol":symbol,
"id":id,
let body = {
"symbol": symbol,
"id": id,
}
let { data } = await axios.post(url,body);
if (data.state!=0) {
logger.error("getUserFillsFromCore",data.msg);
return false
let { data } = await axios.post(url, body);
if (data.state != 0) {
logger.error("addCoin2Core", data.msg);
res.is_success = false;
res.err_msg = data.msg;
}
return true;
return res;
}
export const addPairToCore = async(body)=> {
export const addPairToCore = async (body) => {
let res = {
is_success: true,
err_msg: ""
}
const url = `${webadmin_endpoint}/pair/add_product`
let { data } = await axios.post(url,body);
if (data.state!=0) {
logger.error("getUserFillsFromCore",data.msg);
return false
let { data } = await axios.post(url, body);
if (data.state != 0) {
logger.error("addPairToCore", data.msg);
res.is_success = false;
res.err_msg = data.msg;
}
return true;
return res;
}
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