Commit 434126bf authored by 1486327116's avatar 1486327116

add fills 查询

parent b80e1120
...@@ -11,11 +11,11 @@ let { logger } = require('@madex/ex-js-public'); ...@@ -11,11 +11,11 @@ let { logger } = require('@madex/ex-js-public');
export const getCoinFromCore = async(symbol)=> { export const getCoinFromCore = async(symbol)=> {
const url = `${webadmin_endpoint}/asset/by_symbol?symbol=${symbol}` const url = `${webadmin_endpoint}/asset/by_symbol?symbol=${symbol}`
let { data } = await axios.get(url); let { data } = await axios.get(url);
if (data.error) { if (data.state!=0) {
logger.error("getCoinFromCore",data); logger.error("getCoinFromCore",data.msg);
return null return null
} }
return data[0]; return data.result[0];
} }
// { // {
...@@ -29,11 +29,11 @@ export const getCoinFromCore = async(symbol)=> { ...@@ -29,11 +29,11 @@ export const getCoinFromCore = async(symbol)=> {
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}` const url = `${webadmin_endpoint}/pair/by_symbol?symbol=${symbol}&market=${market}`
let { data } = await axios.get(url); let { data } = await axios.get(url);
if (data.error) { if (data.state!=0) {
logger.error("getPairFromCore",data); logger.error("getPairFromCore",data.msg);
return null return null
} }
return data[0] return data.result[0]
} }
// res: // res:
...@@ -41,11 +41,14 @@ export const getPairFromCore = async(symbol,market="spot")=> { ...@@ -41,11 +41,14 @@ export const getPairFromCore = async(symbol,market="spot")=> {
export const getUserAccountFromCore = async(userId,withName = true)=> { export const getUserAccountFromCore = async(userId,withName = true)=> {
const url = `${webadmin_endpoint}/account/list?user_id=${userId}` const url = `${webadmin_endpoint}/account/list?user_id=${userId}`
let { data } = await axios.get(url); let { data } = await axios.get(url);
if (data.error) {
logger.error("getPairFromCore",data); if (data.state!=0) {
logger.error("getPairFromCore",data.msg);
return null return null
} }
let asset_id = _.map(data,'asset'); let assets= data.result
let asset_id = _.map(assets,'asset');
if (withName) { if (withName) {
let names = await coinType.prototype.findAll({ let names = await coinType.prototype.findAll({
attributes:['general_name','asset_id'], attributes:['general_name','asset_id'],
...@@ -56,15 +59,14 @@ export const getUserAccountFromCore = async(userId,withName = true)=> { ...@@ -56,15 +59,14 @@ export const getUserAccountFromCore = async(userId,withName = true)=> {
raw:true raw:true
}) })
let m = _.keyBy(names,'asset_id'); let m = _.keyBy(names,'asset_id');
for (const item of data) { for (const item of assets) {
if (m[item.asset]) { if (m[item.asset]) {
item.name = m[item.asset].general_name item.name = m[item.asset].general_name
} }
} }
} }
// console.log(data)
return data; return assets;
} }
// user_id // user_id
...@@ -81,12 +83,11 @@ export const getUserOrdersFromCore = async(params)=> { ...@@ -81,12 +83,11 @@ export const getUserOrdersFromCore = async(params)=> {
// let params = new URLSearchParams(); // let params = new URLSearchParams();
const url = `${webadmin_endpoint}/order/list` const url = `${webadmin_endpoint}/order/list`
let { data } = await axios.get(url,{params}); let { data } = await axios.get(url,{params});
if (data.error) { if (data.state!=0) {
logger.error("getPairFromCore",data); logger.error("getPairFromCore",data.msg);
return null return null
} }
console.log(data) return data.result
return data
} }
// user_id // user_id
...@@ -101,12 +102,11 @@ export const getUserFillsFromCore = async(params)=> { ...@@ -101,12 +102,11 @@ export const getUserFillsFromCore = async(params)=> {
// let params = new URLSearchParams(); // let params = new URLSearchParams();
const url = `${webadmin_endpoint}/fill/list` const url = `${webadmin_endpoint}/fill/list`
let { data } = await axios.get(url,{params}); let { data } = await axios.get(url,{params});
if (data.error) { if (data.state!=0) {
logger.error("getPairFromCore",data); logger.error("getUserFillsFromCore",data.msg);
return null return null
} }
console.log(data) return data.result
return data
} }
...@@ -119,9 +119,9 @@ export const addCoin2Core = async(symbol,id)=> { ...@@ -119,9 +119,9 @@ export const addCoin2Core = async(symbol,id)=> {
"id":id, "id":id,
} }
let { data } = await axios.post(url,body); let { data } = await axios.post(url,body);
if (data.error) { if (data.state!=0) {
logger.error(data); logger.error("getUserFillsFromCore",data.msg);
return false; return false
} }
return true; return true;
} }
...@@ -129,9 +129,9 @@ export const addCoin2Core = async(symbol,id)=> { ...@@ -129,9 +129,9 @@ export const addCoin2Core = async(symbol,id)=> {
export const addPairToCore = async(body)=> { export const addPairToCore = async(body)=> {
const url = `${webadmin_endpoint}/pair/add_product` const url = `${webadmin_endpoint}/pair/add_product`
let { data } = await axios.post(url,body); let { data } = await axios.post(url,body);
if (data.error) { if (data.state!=0) {
logger.error(data); logger.error("getUserFillsFromCore",data.msg);
return false; return false
} }
return true; return true;
} }
......
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