|
@@ -1,5 +1,7 @@
|
|
|
use std::collections::{BTreeMap};
|
|
use std::collections::{BTreeMap};
|
|
|
|
|
+use std::str::FromStr;
|
|
|
use chrono::NaiveDateTime;
|
|
use chrono::NaiveDateTime;
|
|
|
|
|
+use rust_decimal::Decimal;
|
|
|
use tracing::info;
|
|
use tracing::info;
|
|
|
use crate::{export_template};
|
|
use crate::{export_template};
|
|
|
use crate::swap_gate::gate_swap_rest_utils::GateSwapRest;
|
|
use crate::swap_gate::gate_swap_rest_utils::GateSwapRest;
|
|
@@ -123,7 +125,7 @@ pub async fn export_balance(config_info: BalanceConfigInfo) {
|
|
|
//2. 数据根据时间片 补全数据
|
|
//2. 数据根据时间片 补全数据
|
|
|
for time in &export_time_list {
|
|
for time in &export_time_list {
|
|
|
// 根据时间片去拿数据 ,如果有添加没有,手动添加
|
|
// 根据时间片去拿数据 ,如果有添加没有,手动添加
|
|
|
- let mut sum_pr: f64 = 0 as f64;
|
|
|
|
|
|
|
+ let mut sum_pr = Decimal::ZERO;
|
|
|
for (key, vale) in acc_all_data.clone() {
|
|
for (key, vale) in acc_all_data.clone() {
|
|
|
let mut value = vale.clone();
|
|
let mut value = vale.clone();
|
|
|
value.sort_by(|a, b| a[0].cmp(&b[0]));
|
|
value.sort_by(|a, b| a[0].cmp(&b[0]));
|
|
@@ -171,12 +173,13 @@ pub async fn export_balance(config_info: BalanceConfigInfo) {
|
|
|
acc_contract = zj_v[5].clone();
|
|
acc_contract = zj_v[5].clone();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ let acc_balance_round = Decimal::from_str(&acc_balance).unwrap().round_dp(2);
|
|
|
|
|
|
|
|
row.push(acc_name);
|
|
row.push(acc_name);
|
|
|
row.push(acc_time);
|
|
row.push(acc_time);
|
|
|
row.push(acc_o_id);
|
|
row.push(acc_o_id);
|
|
|
row.push(acc_change);
|
|
row.push(acc_change);
|
|
|
- row.push(acc_balance);
|
|
|
|
|
|
|
+ row.push(acc_balance_round.to_string());
|
|
|
row.push(acc_type);
|
|
row.push(acc_type);
|
|
|
row.push(acc_contract);
|
|
row.push(acc_contract);
|
|
|
row
|
|
row
|
|
@@ -192,7 +195,7 @@ pub async fn export_balance(config_info: BalanceConfigInfo) {
|
|
|
// info!("{:?}----时间片:{:?}",new_d[0].clone(),time_str);
|
|
// info!("{:?}----时间片:{:?}",new_d[0].clone(),time_str);
|
|
|
// info!("计算3333:---{:?}",time_str);
|
|
// info!("计算3333:---{:?}",time_str);
|
|
|
// info!("{:?}=----pr:{:?}",key.clone().to_string(),new_d[4].clone());
|
|
// info!("{:?}=----pr:{:?}",key.clone().to_string(),new_d[4].clone());
|
|
|
- sum_pr = sum_pr + new_d[4].clone().parse::<f64>().unwrap();
|
|
|
|
|
|
|
+ sum_pr = sum_pr + Decimal::from_str(&new_d[4]).unwrap();
|
|
|
data_array_all.push(new_d);
|
|
data_array_all.push(new_d);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -201,7 +204,7 @@ pub async fn export_balance(config_info: BalanceConfigInfo) {
|
|
|
sum_row.push(time.clone().to_string());
|
|
sum_row.push(time.clone().to_string());
|
|
|
sum_row.push("".to_string());
|
|
sum_row.push("".to_string());
|
|
|
sum_row.push("0".to_string());
|
|
sum_row.push("0".to_string());
|
|
|
- sum_row.push(format!("{}", sum_pr));
|
|
|
|
|
|
|
+ sum_row.push(sum_pr.to_string());
|
|
|
sum_row.push("".to_string());
|
|
sum_row.push("".to_string());
|
|
|
sum_row.push("".to_string());
|
|
sum_row.push("".to_string());
|
|
|
data_array_all.push(sum_row.clone());
|
|
data_array_all.push(sum_row.clone());
|