Skip to content

F
fund_report
Commit 8013be54 authored by 赵杰's avatar 赵杰
Browse files
Options

成本精度

parent b903fb95
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
app/service/result_service_v2.py
View file @ 8013be54
...@@ -77,7 +77,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -77,7 +77,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
"cumulative": cumulative_data} "cumulative": cumulative_data}
# 总成本 # 总成本
total_cost = round(float((cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["confirm_share"]*cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["nav"]).sum()), 2) total_cost = round(float((cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["confirm_share"]*cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["nav"]).sum()), 0)
folio_report_data["total_cost"] = total_cost folio_report_data["total_cost"] = total_cost
# 累积盈利 # 累积盈利
...@@ -245,7 +245,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -245,7 +245,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
resample_df = resample_df[resample_df.index <= self.end_date] resample_df = resample_df[resample_df.index <= self.end_date]
# 总成本 # 总成本
total_cost = round(float((cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["confirm_share"]*cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["nav"]).sum()), 2) total_cost = round(float((cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["confirm_share"]*cur_folio_order_data[cur_folio_order_data["order_type"] == 1]["nav"]).sum()), 0)
report_data["total_cost"] = total_cost report_data["total_cost"] = total_cost
# 累积盈利 # 累积盈利
...@@ -307,6 +307,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -307,6 +307,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
else: else:
if len(cur_profit_ratio) < 1: if len(cur_profit_ratio) < 1:
cur_year_profit_ratio = 0.0 cur_year_profit_ratio = 0.0
else:
if len(cur_profit_ratio) < 1:
cur_year_profit_ratio = 0
else: else:
cur_year_profit_ratio = (cur_profit_ratio[-1] - last_profit_ratio[-1]) / last_profit_ratio[-1] cur_year_profit_ratio = (cur_profit_ratio[-1] - last_profit_ratio[-1]) / last_profit_ratio[-1]
report_data["cur_year_profit_ratio"] = float(cur_year_profit_ratio) report_data["cur_year_profit_ratio"] = float(cur_year_profit_ratio)
......
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