Commit 514c3b09 authored by 赵杰's avatar 赵杰

本月收益率

parent e273eee4
...@@ -116,6 +116,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -116,6 +116,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
cur_profit_ratio = return_ratio_df.loc[self.month_start_date - datetime.timedelta(days=1):, "cum_return_ratio"].values cur_profit_ratio = return_ratio_df.loc[self.month_start_date - datetime.timedelta(days=1):, "cum_return_ratio"].values
if len(last_profit_ratio) <= 0: if len(last_profit_ratio) <= 0:
cur_month_profit_ratio = cur_profit_ratio[-1] - 1 cur_month_profit_ratio = cur_profit_ratio[-1] - 1
else:
if len(cur_profit_ratio) < 1:
cur_month_profit_ratio = 0
else: else:
cur_month_profit_ratio = (cur_profit_ratio[-1] - last_profit_ratio[-1]) / last_profit_ratio[-1] cur_month_profit_ratio = (cur_profit_ratio[-1] - last_profit_ratio[-1]) / last_profit_ratio[-1]
folio_report_data["cur_month_profit_ratio"] = float(cur_month_profit_ratio) folio_report_data["cur_month_profit_ratio"] = float(cur_month_profit_ratio)
...@@ -267,6 +270,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -267,6 +270,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
cur_profit_ratio = return_ratio_df.loc[self.month_start_date:, "cum_return_ratio"].values cur_profit_ratio = return_ratio_df.loc[self.month_start_date:, "cum_return_ratio"].values
if len(last_profit_ratio) <= 0: if len(last_profit_ratio) <= 0:
cur_month_profit_ratio = cur_profit_ratio[-1] - 1 cur_month_profit_ratio = cur_profit_ratio[-1] - 1
else:
if len(cur_profit_ratio) < 1:
cur_month_profit_ratio = 0
else: else:
cur_month_profit_ratio = (cur_profit_ratio[-1] - last_profit_ratio[-1]) / last_profit_ratio[-1] cur_month_profit_ratio = (cur_profit_ratio[-1] - last_profit_ratio[-1]) / last_profit_ratio[-1]
report_data["cur_month_profit_ratio"] = float(cur_month_profit_ratio) report_data["cur_month_profit_ratio"] = float(cur_month_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