From 2185fa9e701eb0d955caafb539a03ddf98185d40 Mon Sep 17 00:00:00 2001
From: zhaojie <zhaojie01@wealthgrow.cn>
Date: Wed, 27 Jan 2021 13:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BD=E9=A2=9D=E6=A0=B8=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/data_service_v2_1.py | 3 +--
 app/service/result_service_v2.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/service/data_service_v2_1.py b/app/service/data_service_v2_1.py
index 100b097..9a27908 100644
--- a/app/service/data_service_v2_1.py
+++ b/app/service/data_service_v2_1.py
@@ -142,9 +142,8 @@ class UserCustomerDataAdaptor:
                                 need_less_share -= ori_share
                                 user_customer_order_df.loc[index_ori, "confirm_share"] = 0
                             else:
+                                user_customer_order_df.loc[index_ori, "confirm_share"] = row_ori["confirm_share"] - need_less_share
                                 need_less_share = 0
-                                user_customer_order_df.loc[index_ori, "confirm_share"] = row_ori[
-                                                                                           "confirm_share"] - need_less_share
                             if need_less_share <= 0:
                                 break
             user_customer_order_df = user_customer_order_df[(user_customer_order_df["order_type"] == 1)&(user_customer_order_df["confirm_share"] > 0)]
diff --git a/app/service/result_service_v2.py b/app/service/result_service_v2.py
index c98f516..7d48535 100644
--- a/app/service/result_service_v2.py
+++ b/app/service/result_service_v2.py
@@ -455,7 +455,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
             fund_hoding_info["market_values"] = round((float(row["confirm_share"]) * (fund_basic_info["cur_cnav"] - confirm_cnav) + float(row["confirm_amount"]))/10000, 2)
             temp_market_values = float(row["confirm_share"]) * (fund_basic_info["cur_cnav"] - confirm_cnav) + float(row["confirm_amount"])
             fund_hoding_info["weight"] = "%.2f" % round(float(fund_hoding_info["market_values"]) / total_market_values * 10000.0 * 100, 2)  # 月末占比
-            fund_hoding_info["cost"] = "%.2f" % round(float(row["confirm_amount"])/10000, 2)     # 投资本金
+            fund_hoding_info["cost"] = "%.2f" % round(float(row["confirm_share"]*row["nav"])/10000, 2)     # 投资本金
             # 当月收益
             if row['confirm_share_date'] > self.month_start_date:
                 cal_month_start_date = row['confirm_share_date']
-- 
2.18.1