浙江白鹭

app/service/portfolio_diagnose.py

@@ -411,7 +411,7 @@ def get_fund_name(fund, fund_type=1):
             data = cur.fetchall()
             df = pd.DataFrame(list(data), columns=['fund_short_name'])
             return df
-    elif fund_type == 1 or fund_type == 2:
+    elif fund_type == 1:
         with TAMP_SQL(tamp_fund_engine) as tamp_fund:
             tamp_fund_session = tamp_fund.session
             sql = "SELECT fund_short_name FROM fund_info WHERE id='{}'".format(fund)
@@ -419,15 +419,15 @@ def get_fund_name(fund, fund_type=1):
             cur = tamp_fund_session.execute(sql)
             data = cur.fetchall()
             df = pd.DataFrame(list(data), columns=['fund_short_name'])
-            if len(df) == 0:
-                with TAMP_SQL(tamp_product_engine) as tamp_product:
-                    tamp_product_session = tamp_product.session
-                    sql = "SELECT fund_short_name FROM fund_info WHERE id='{}'".format(fund)
-                    # df = pd.read_sql(sql, con)
-                    cur = tamp_product_session.execute(sql)
-                    data = cur.fetchall()
-                    df = pd.DataFrame(list(data), columns=['fund_short_name'])
-                    return df
+            return df
+    elif fund_type == 2:
+        with TAMP_SQL(tamp_product_engine) as tamp_product:
+            tamp_product_session = tamp_product.session
+            sql = "SELECT fund_short_name FROM fund_info WHERE id='{}'".format(fund)
+            # df = pd.read_sql(sql, con)
+            cur = tamp_product_session.execute(sql)
+            data = cur.fetchall()
+            df = pd.DataFrame(list(data), columns=['fund_short_name'])
             return df
     else:
         with TAMP_SQL(tamp_fund_engine) as tamp_fund: