核减日期排序问题，月度收益的日期切片

app/service/data_service_v2_1.py

@@ -128,6 +128,7 @@ class UserCustomerDataAdaptor:
             self.valueSex = user_customer_order_df["valueSex"].values[0]
             user_customer_order_df = user_customer_order_df[user_customer_order_df["confirm_share_date"] <= self.end_date]
             user_customer_order_df["confirm_amount"] = user_customer_order_df["confirm_amount"] - user_customer_order_df["subscription_fee"]
+            user_customer_order_df.sort_values(by="confirm_share_date", inplace=True)
             user_customer_order_df.index = pd.Series(range(len(user_customer_order_df)))
 
             for index, row in user_customer_order_df.iterrows():

app/service/result_service_v2.py

@@ -285,7 +285,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
         report_data["cur_month_profit"] = float(cur_month_profit)
 
         # 本月累积收益率
-        last_profit_ratio = return_ratio_df.loc[:self.month_start_date, "cum_return_ratio"].values
+        last_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:, "cum_return_ratio"].values
         if len(last_profit_ratio) <= 0:
             cur_month_profit_ratio = cur_profit_ratio[-1] - 1