增加接口

src/functional/mvc/control/mUserOrderPendingAndHistory.control.ts

@@ -45,5 +45,25 @@ export const historyList = async (req: any, queryVo: QueryVo) => {
     }
 };
 
+/**
+ * 现货成交记录列表
+ * @param req
+ * @param infoVO
+ */
+export const detailList = async (req: any, queryVo: QueryVo) => {
+    let func_name = "pendingAndHistoryCtrl.detailList";
+    try {
+        if (!queryVo.user_id) {
+            throw ErrorCode.PARAM_MISS
+        }
+        let res = await service.detailList(queryVo);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
 
 

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

@@ -2,18 +2,18 @@ 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";
+import { getUserFillsFromCore, getUserOrdersFromCore } from "../../../utils/coreSystemUtils";
 
 let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert } = require('@madex/ex-js-public');
 
 export interface QueryVo {
-    update_id?: string
+    user_id?: number
 
-    is_next?: number//1 下一页
+    before?: string
 
-    size?: number
+    after?: string
 
-    user_id?: number
+    limit?: number
 }
 
 export const pendingList = async (queryVo: QueryVo) => {
@@ -30,9 +30,33 @@ export const historyList = async (queryVo: QueryVo) => {
         user_id: queryVo.user_id,
         status: "settled"//历史委托
     }
-
+    if (queryVo.before) {
+        param['before'] = queryVo.before
+    }
+    if (queryVo.after) {
+        param['after'] = queryVo.after
+    }
+    if (queryVo.limit) {
+        param['limit'] = queryVo.limit
+    }
     let res = await getUserOrdersFromCore(param);
-    Array.isArray(res);
+    return res;
+};
+
+export const detailList = async (queryVo: QueryVo) => {
+    let param = {
+        user_id: queryVo.user_id,
+    }
+    if (queryVo.before) {
+        param['before'] = queryVo.before
+    }
+    if (queryVo.after) {
+        param['after'] = queryVo.after
+    }
+    if (queryVo.limit) {
+        param['limit'] = queryVo.limit
+    }
+    let res = await getUserFillsFromCore(param);
     return res;
 };
 

src/functional/router/v1/index.ts

@@ -122,6 +122,7 @@ const postFunc = {
     'mUser/manage/tradeAsset/detail': mUserAssetsCtrl.tradeAssetsDetail,//Madex 用户管理 ->交易账户资产详情
     'mUser/manage/order/pending/list': orderPendingAndHistoryCtrl.pendingList,//Madex 用户管理 ->当前委托
     'mUser/manage/order/history/list': orderPendingAndHistoryCtrl.historyList,//Madex 用户管理 ->历史委托
+    'mUser/manage/order/detail/list': orderPendingAndHistoryCtrl.detailList,//Madex 用户管理 ->成交记录
 
     //资源位管理
     'link/useful/list': usefulLinkCtrl.list,//链接记录列表

src/setting/access-limit.ts

@@ -91,6 +91,7 @@ let cmdWhiteList = {
     'mUser/manage/tradeAsset/detail': 1,
     'mUser/manage/order/pending/list': 1,
     'mUser/manage/order/history/list': 1,
+    'mUser/manage/order/detail/list': 1,
     //资源位管理
     'link/useful/list': 1,
     'link/useful/add': 1,