From 79fec9c921a949bbfaf9c23bbaf0e1be0cf2ff43 Mon Sep 17 00:00:00 2001
From: zhaojie <zhaojie01@wealthgrow.cn>
Date: Mon, 22 Feb 2021 18:13:26 +0800
Subject: [PATCH] shift
---
app/service/data_service_v2_1.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/service/data_service_v2_1.py b/app/service/data_service_v2_1.py
index 6aee1ca..b746944 100644
--- a/app/service/data_service_v2_1.py
+++ b/app/service/data_service_v2_1.py
@@ -502,7 +502,7 @@ class UserCustomerDataAdaptor:
# actual_share_dict[cur_fund_id] = cur_fund_share
for p_fund_id_ in p_outside_order_df["fund_id"].unique():
- cnav_df[p_fund_id_ + "_earn"] = (cnav_df[p_fund_id_ + "_profit"] * cnav_df[p_fund_id_ + "_share"]).apply(
+ cnav_df[p_fund_id_ + "_earn"] = (cnav_df[p_fund_id_ + "_profit"] * cnav_df[p_fund_id_ + "_share"].shift(1)).fillna(0).apply(
lambda x: float(x)).fillna(0)
cnav_df[p_fund_id_ + "_cum_earn"] = cnav_df[p_fund_id_ + "_earn"].cumsum().fillna(0)
cnav_df[p_fund_id_ + "_net_amount"] = cnav_df[p_fund_id_ + "_cum_earn"].apply(lambda x: Decimal(x)) + \
@@ -666,7 +666,7 @@ class UserCustomerDataAdaptor:
# actual_share_dict[cur_fund_id] = cur_fund_share
for p_fund_id_ in p_outside_order_df["fund_id"].unique():
- cnav_df[p_fund_id_ + "_earn"] = (cnav_df[p_fund_id_ + "_profit"] * cnav_df[p_fund_id_ + "_share"]).apply(lambda x: float(x)).fillna(0)
+ cnav_df[p_fund_id_ + "_earn"] = (cnav_df[p_fund_id_ + "_profit"] * cnav_df[p_fund_id_ + "_share"].shift(1)).fillna(0).apply(lambda x: float(x)).fillna(0)
cnav_df[p_fund_id_ + "_cum_earn"] = cnav_df[p_fund_id_ + "_earn"].cumsum().fillna(0)
cnav_df[p_fund_id_ + "_net_amount"] = cnav_df[p_fund_id_ + "_cum_earn"].apply(lambda x: Decimal(x)) + cnav_df[p_fund_id_ + "_amount"]
for p_fund_id_ in p_inter_order_df["fund_id"].unique():
--
2.18.1