结果值0

app/service/data_service.py

@@ -84,7 +84,7 @@ class UserCustomerDataAdaptor:
             user_customer_order_df = order_df.set_index('fund_id').join(product_df.set_index('fund_id')).reset_index()
             self.start_date = user_customer_order_df["confirm_share_date"].min()
             self.customer_real_name = user_customer_order_df["customer_name"].values[0]
-            user_customer_order_df = user_customer_order_df[user_customer_order_df["confirm_share_date"] < self.end_date]
+            user_customer_order_df = user_customer_order_df[user_customer_order_df["confirm_share_date"] <= self.end_date]
             user_customer_order_df.index = pd.Series(range(len(user_customer_order_df)))
             return user_customer_order_df
 

app/service/result_service_v2.py

@@ -414,6 +414,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
             fund_profit_ratio = nav_net_amount_df[amount_name + "_profit_ratio"].dropna() + 1
             amount_ratio_shift = nav_net_amount_df[amount_name + "_amount_ratio"].shift(1)
             num_va = len(amount_ratio_shift[amount_ratio_shift.values==0])
+            if num_va+1 > len(amount_ratio_shift):
+                amount_ratio_shift.iloc[num_va] = 0
+            else:
                 amount_ratio_shift.iloc[num_va] = amount_ratio_shift.values[num_va+1]
             nav_net_amount_df[amount_name + "_profit_ratio_weight"] =  amount_ratio_shift * nav_net_amount_df[amount_name + "_profit_ratio"]
             nav_net_amount_df[amount_name + "_profit_cum_ratio_weight"] = (fund_profit_ratio.cumprod()-1)*amount_ratio_shift # enter_date = nav_net_amount_df[amount_name+"_profit_ratio"].dropna()