Commit 6dc2bddc authored by ml's avatar ml

资产管理后台-自动对账列表修改

parent 83448e01
...@@ -237,7 +237,13 @@ export async function fundingTotalRecords() { ...@@ -237,7 +237,13 @@ export async function fundingTotalRecords() {
//账户 //账户
let accountList = await financeAccountDataUtils.getAccountInfoList(); let accountList = await financeAccountDataUtils.getAccountInfoList();
if (!accountList.length) { if (!accountList.length) {
return; return {
category_count,
total_init_asset,
total_balance,
total_sub_value,
category_list
};
} }
let dataList = await financeAccountDataUtils.getFundingDataByAccounts(accountList); let dataList = await financeAccountDataUtils.getFundingDataByAccounts(accountList);
if (dataList.length) { if (dataList.length) {
...@@ -365,7 +371,13 @@ export async function autoCheckList() { ...@@ -365,7 +371,13 @@ export async function autoCheckList() {
//账户 //账户
let accountList = await financeAccountDataUtils.getAccountInfoList(); let accountList = await financeAccountDataUtils.getAccountInfoList();
if (!accountList.length) { if (!accountList.length) {
return; return {
account_count,
total_init_asset,
total_balance,
total_change_value,
account_data_list
};
} }
let dataList = await financeAccountDataUtils.getMultiCoinFundingDataByAccounts(accountList); let dataList = await financeAccountDataUtils.getMultiCoinFundingDataByAccounts(accountList);
if (dataList.length) { if (dataList.length) {
...@@ -406,7 +418,23 @@ export async function autoCheckList() { ...@@ -406,7 +418,23 @@ export async function autoCheckList() {
let initSymbols = _.keys(initAmountMap); let initSymbols = _.keys(initAmountMap);
let balanceSymbols = _.keys(multiCoinMap); let balanceSymbols = _.keys(multiCoinMap);
let symbolsArray = _.union(initSymbols, balanceSymbols); let symbolsArray = _.union(initSymbols, balanceSymbols);
//有账户 没有 初始资金 和 余额的情况
if (!symbolsArray.length) {
let listOne = {
account_id: account_id,
account_name: aMap[account_id] ? aMap[account_id].account : "",
remark: aMap[account_id] ? aMap[account_id].remark : "",
symbol: "--",
init: new BigNumber(0),
init_usdt: 0,
balance: new BigNumber(0),
balance_usdt: new BigNumber(0),
change: new BigNumber(0),
change_usdt: new BigNumber(0)
}
account_data_list.push(listOne);
}
else {
for (let oneSymbol of symbolsArray) { for (let oneSymbol of symbolsArray) {
let symbol_usdt_rate = tickerMap[oneSymbol] ? tickerMap[oneSymbol] : await tickerUtils.rateCoin2USDT(oneSymbol); let symbol_usdt_rate = tickerMap[oneSymbol] ? tickerMap[oneSymbol] : await tickerUtils.rateCoin2USDT(oneSymbol);
let init = initAmountMap[oneSymbol] ? initAmountMap[oneSymbol].amount : 0; let init = initAmountMap[oneSymbol] ? initAmountMap[oneSymbol].amount : 0;
...@@ -433,6 +461,7 @@ export async function autoCheckList() { ...@@ -433,6 +461,7 @@ export async function autoCheckList() {
} }
} }
} }
}
return { return {
account_count, account_count,
total_init_asset, total_init_asset,
......
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