Merge remote-tracking branch 'origin/master'

cron/task/coinAndPairSetting.ts

@@ -48,7 +48,7 @@ const syncPair = async () => {
             if (cfg) {
                 await pairModel.prototype.update({
                     status: 2,
-                    product_id: cfg.id,
+                    product_id: cfg.productId,
                     price_scale: cfg["priceScale"],
                     price_increment: cfg["priceIncrement"],
                     quantity_scale: cfg["quantityScale"],

src/functional/mvc/service/contractPair.service.ts

@@ -183,7 +183,7 @@ export const pushToCoreSystem = async (id: any, currentUserId: any, ip: any) =>
     let base = sps[0];
     let quote = sps[1]
     let param = {
-        "market_type": 2,
+        "market": "lpc",
         "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,

src/functional/mvc/service/mUserOrderPendingAndHistory.service.ts

@@ -7,6 +7,8 @@ import { getUserFillsFromCore, getUserOrdersFromCore } from "../../../utils/core
 let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert } = require('@madex/ex-js-public');
 
 export interface QueryVo {
+    market?: string
+
     user_id?: number
 
     before?: string
@@ -19,7 +21,8 @@ export interface QueryVo {
 export const pendingList = async (queryVo: QueryVo) => {
     let param = {
         user_id: queryVo.user_id,
-        status: "unsettled"//当前委托
+        status: "unsettled",//当前委托
+        market:queryVo.market
     }
     let res = await getUserOrdersFromCore(param);
     return res;
@@ -28,7 +31,8 @@ export const pendingList = async (queryVo: QueryVo) => {
 export const historyList = async (queryVo: QueryVo) => {
     let param = {
         user_id: queryVo.user_id,
-        status: "settled"//历史委托
+        status: "settled",//历史委托
+        market:queryVo.market
     }
     if (queryVo.before) {
         param['before'] = queryVo.before

src/functional/mvc/service/pairApply.service.ts

@@ -331,7 +331,7 @@ export async function review(id: any, currentUser: any, ip: string | undefined)
         }
         else {
             param = {
-                "market_type": 2,
+                "market": "lpc",
                 "base": base, "quote": quote, "symbol": dbPair.symbol, "name": dbPair.symbol,
                 "price_scale": dbPair.price_scale, "quantity_scale": dbPair.quantity_scale,
                 "maker_fee": dbPair.maker_fee, "taker_fee": dbPair.taker_fee,

src/utils/coreSystemUtils.ts

@@ -30,10 +30,17 @@ export const getCoinFromCore = async (symbol) => {
 // "priceScale":4,
 // "maxOrderSize":"0",
 // "maxOrderValue":"0",
-// "minOrderValue":"0"}
+// "minOrderValue":"0"
+// "productId:1"
+// }
 // 合约的话还有多余对应db字段 predictedFundingRate nextFundingTime ...
 export const getPairFromCore = async (symbol) => {
-    const url = `${webadmin_endpoint}/pair/by_symbol?symbol=${symbol}`
+    let market = "spot"
+    if (symbol.endsWith("_SWAP")) {
+        market = "lpc"
+    }
+    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);
@@ -75,6 +82,7 @@ export const getUserAccountFromCore = async (userId, withName = true) => {
     return assets;
 }
 
+// market 默认spot 合约为lpc
 // user_id
 // status, // 必须 unsettled或者settled
 // symbol, // 可选，交易对
@@ -96,6 +104,7 @@ export const getUserOrdersFromCore = async (params) => {
     return data.result
 }
 
+// market 默认spot 合约为lpc
 // user_id
 // symbol, // 可选，交易对
 // start_time, // 成交时间
@@ -154,10 +163,17 @@ export const addPairToCore = async (body) => {
 
 // 设置手续费 至少指定user_id 和 symbol 二者其一
 export const changeTradingFee = async (symbol,user_id,maker_fee,taker_fee) => {
+
     let body = {
         maker_fee,taker_fee,
     }
     if (symbol) {
+        let market = "spot"
+        if (symbol.endsWith("_SWAP")) {
+            market = "lpc"
+        }
+        body["market"] = market;
+
         body["symbol"] = symbol;
     }
     if (user_id>0) {