Skip to content

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

Decimal数据

parent a8ec611a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
app/service/data_service.py
View file @ d928ec39
...@@ -183,13 +183,13 @@ class UserCustomerDataAdaptor: ...@@ -183,13 +183,13 @@ class UserCustomerDataAdaptor:
if len(last_nav_data) < 1: if len(last_nav_data) < 1:
cnav_df.loc[confirm_share_date, cur_fund_id] = row["nav"] cnav_df.loc[confirm_share_date, cur_fund_id] = row["nav"]
else: else:
diff_nav = Decimal(row["nav"]) - last_nav_data.values[0] diff_nav = Decimal(row["nav"]) - Decimal(last_nav_data.values[0])
cur_cnav = last_cnav_data.values[0] + diff_nav cur_cnav = last_cnav_data.values[0] + diff_nav
cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav
else: else:
confirm_date_nav_data = p_nav_df[p_nav_df.index == confirm_share_date][cur_fund_id].tail(1) confirm_date_nav_data = p_nav_df[p_nav_df.index == confirm_share_date][cur_fund_id].tail(1)
confirm_date_cnav_data = p_cnav_df[p_cnav_df.index == confirm_share_date][cur_fund_id].tail(1) confirm_date_cnav_data = p_cnav_df[p_cnav_df.index == confirm_share_date][cur_fund_id].tail(1)
diff_nav = Decimal(row["nav"]) - confirm_date_nav_data.values[0] diff_nav = Decimal(row["nav"]) - Decimal(confirm_date_nav_data.values[0])
cur_cnav = confirm_date_cnav_data.values[0] + diff_nav cur_cnav = confirm_date_cnav_data.values[0] + diff_nav
cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav
...@@ -278,13 +278,13 @@ class UserCustomerDataAdaptor: ...@@ -278,13 +278,13 @@ class UserCustomerDataAdaptor:
if len(last_nav_data) < 1: if len(last_nav_data) < 1:
cnav_df.loc[confirm_share_date, cur_fund_id] = row["nav"] cnav_df.loc[confirm_share_date, cur_fund_id] = row["nav"]
else: else:
diff_nav = Decimal(row["nav"]) - last_nav_data.values[0] diff_nav = Decimal(row["nav"]) - Decimal(last_nav_data.values[0])
cur_cnav = last_cnav_data.values[0] + diff_nav cur_cnav = last_cnav_data.values[0] + diff_nav
cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav
else: else:
confirm_date_nav_data = p_nav_df[p_nav_df.index == confirm_share_date][cur_fund_id].tail(1) confirm_date_nav_data = p_nav_df[p_nav_df.index == confirm_share_date][cur_fund_id].tail(1)
confirm_date_cnav_data = p_cnav_df[p_cnav_df.index == confirm_share_date][cur_fund_id].tail(1) confirm_date_cnav_data = p_cnav_df[p_cnav_df.index == confirm_share_date][cur_fund_id].tail(1)
diff_nav = Decimal(row["nav"]) - confirm_date_nav_data.values[0] diff_nav = Decimal(row["nav"]) - Decimal(confirm_date_nav_data.values[0])
cur_cnav = confirm_date_cnav_data.values[0] + diff_nav cur_cnav = confirm_date_cnav_data.values[0] + diff_nav
cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav cnav_df.loc[confirm_share_date, cur_fund_id] = cur_cnav
......
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