实时充提

README.md

 ## ts 项目说明
 
+v1 是 Madex 管理后台相关接口
+v2 是资产管理后台相关接口
 1. dao / common 等基础库和 js 使用同一套，后续基础库都用 ts 重构
 2. 业务服务的编码风格暂时保持和 js 风格相同
 3. 目前的 ts-dao 和 demo 项目代码风格都是是为了兼容 bibox 和 broker 中大量 js 代码。这样迁移的成本最低

src/functional/mvc/control/v2/assetCheck.control.ts

@@ -71,7 +71,7 @@ export const depositList = async (req: any, commonParam: CommonParam) => {
     let func_name = "assetCheck.control.depositList";
     try {
         setPageAndSize(commonParam);
-        let res = await assetCheckService.siteAssets(commonParam.page,commonParam.size);
+        let res = await assetCheckService.depositList(commonParam.page,commonParam.size,commonParam.uid_or_addr);
         return Res3Utils.result(res);
     }
     catch (e) {
@@ -90,7 +90,7 @@ export const withdrawList = async (req: any, commonParam: CommonParam) => {
     let func_name = "assetCheck.control.withdrawList";
     try {
         setPageAndSize(commonParam);
-        let res = await assetCheckService.siteAssets(commonParam.page,commonParam.size);
+        let res = await assetCheckService.withdrawList(commonParam.page,commonParam.size,commonParam.uid_or_addr);
         return Res3Utils.result(res);
     }
     catch (e) {
@@ -99,9 +99,6 @@ export const withdrawList = async (req: any, commonParam: CommonParam) => {
     }
 };
 
-function setUidOrAddr(commonParam:CommonParam){
-
-}
 
 
 

src/functional/mvc/service/v2/assetCheck.service.ts

-import { madAdminOrmDB, coinAddress, coinType, mainUserAsset, dwdSpotAssetsApi, ormDB } from "@madex/ex-ts-dao";
+import { madAdminOrmDB, coinAddress, coinType, mainUserAsset, dwdSpotAssetsApi, ormDB, coinTx, coinWithdraw } from "@madex/ex-ts-dao";
 import { getOneAbkUserByAccount, getOneAbkUserByUid, checkAbkTotp } from "../../../../utils/abkUserUtils";
 import { ErrorCode } from "../../../../constant/errorCode";
 import { AbkUserInfoConst } from "../../../../constant/abkUserConstant";
@@ -123,6 +123,66 @@ export async function siteAssets(page: any, size: any) {
     return pageData;
 }
 
+export async function depositList(page: any, size: any, uid_or_addr: any) {
+    let where: any;
+    if (!isNaN(Number(uid_or_addr))) {
+        where = {
+            [ormDB.Op.or]: {
+                user_id: Number(uid_or_addr),
+                to: String(uid_or_addr)
+            }
+        }
+    }
+    else {
+        where = { to: String(uid_or_addr) }
+    }
+
+    let pageData = await coinTx.prototype.findAndCount({
+        attributes: ['user_id', 'coin_id', 'coin_symbol', 'amount', 'to', 'status', 'updatedAt'],
+        where: where,
+        limit: size,
+        offset: (page - 1) * size,
+        order: [['updatedAt', 'desc']],
+        raw: true
+    });
+    let coinIds = pageData.rows.map(item => item.coin_id);
+    let coinTypeMap = await getCoinTypeMapByCoinOrAssetIds(coinIds, []);
+    for (let item of pageData.rows) {
+        item.chain_type = coinTypeMap[item.coin_id] ? coinTypeMap[item.coin_id].chain_type : ""
+    }
+    return pageData
+}
+
+export async function withdrawList(page: any, size: any, uid_or_addr: any) {
+    let where: any;
+    if (!isNaN(Number(uid_or_addr))) {
+        where = {
+            [ormDB.Op.or]: {
+                user_id: Number(uid_or_addr),
+                to_address: String(uid_or_addr)
+            }
+        }
+    }
+    else {
+        where = { to_address: String(uid_or_addr) }
+    }
+
+    let pageData = await coinWithdraw.prototype.findAndCount({
+        attributes: ['user_id', 'coin_id', 'coin_symbol', 'amount', 'to_address', 'status', 'updatedAt'],
+        where: where,
+        limit: size,
+        offset: (page - 1) * size,
+        order: [['updatedAt', 'desc']],
+        raw: true
+    });
+    let coinIds = pageData.rows.map(item => item.coin_id);
+    let coinTypeMap = await getCoinTypeMapByCoinOrAssetIds(coinIds, []);
+    for (let item of pageData.rows) {
+        item.chain_type = coinTypeMap[item.coin_id] ? coinTypeMap[item.coin_id].chain_type : ""
+    }
+    return pageData
+}
+
 
 async function getCoinTypeMapByCoinOrAssetIds(coin_ids: any[], asset_ids?: any[]) {
     let map: any = {};