新表的ifa，去掉内部订单的主函数

app/service/data_service_v2_1.py

@@ -32,14 +32,14 @@ class UserCustomerDataAdaptor:
     all_fund_distribution = {}
     all_fund_performance = {}
 
-    def __init__(self, user_id, customer_id, end_date=str("2020-12-31"), index_id="IN0000007M"):
+    def __init__(self, user_id, customer_id, end_date=str("2021-01-08"), index_id="IN0000007M"):
         self.user_id = user_id
         self.customer_id = customer_id
         self.compare_index_id = index_id
         p_end_date = pd.to_datetime(end_date).date()
         p_end_date = datetime.date(year=p_end_date.year, month=p_end_date.month, day=1) - datetime.timedelta(days=1)
         self.end_date = pd.to_datetime(str(p_end_date))
-        # self.end_date = pd.to_datetime("2020-12-25")
+        self.end_date = pd.to_datetime("2021-01-08")
         p_start_date = datetime.date(year=p_end_date.year, month=p_end_date.month, day=1)
         self.month_start_date = p_start_date
         # self.month_start_date = pd.to_datetime("2020-12-01")
@@ -80,7 +80,7 @@ class UserCustomerDataAdaptor:
             tamp_diagnose_app_session = tamp_diagnose_app.session
             tamp_product_session = tamp_product.session
             tamp_fund_session = tamp_fund.session
-            sql_user = """select f1.fund_id, f2.realname,f3.customer_name,f1.type,f1.order_type,f1.pay_date,f1.subscription_fee,f1.confirm_share_date,f1.confirm_share,f1.confirm_amount,f1.nav,f1.folio_name from tamp_order.customer_order_view f1, tamp_user.user_info f2,tamp_user.customer_info f3   where f2.id=f1.user_id and f3.id=f1.customer_id  and f1.delete_tag=0 and user_id='{}' and customer_id='{}'""".format(self.user_id, self.customer_id)
+            sql_user = """select f1.fund_id, f2.realname,f3.customer_name,f1.type,f1.order_type,f1.pay_date,f1.subscription_fee,f1.confirm_share_date,f1.confirm_share,f1.confirm_amount,f1.nav,f1.folio_name from tamp_order.customer_order_view f1, tamp_user.user_info f2,tamp_order.customer f3   where f2.id=f1.user_id and f3.id=f1.customer_id  and f1.delete_tag=0 and user_id='{}' and customer_id='{}'""".format(self.user_id, self.customer_id)
             cur = tamp_diagnose_app_session.execute(sql_user)
             data = cur.fetchall()
             order_df = pd.DataFrame(list(data), columns=['fund_id', 'username', 'customer_name', 'type', 'order_type', 'pay_date',

app/utils/timed_task_v2.py

@@ -9,7 +9,7 @@ import datetime
 import time
 import traceback
 import uuid
-
+import pandas as pd
 from app.api.engine import logging, pdf_folder, tamp_diagnose_app_engine, config, env
 import os
 
@@ -80,8 +80,19 @@ if __name__ == '__main__':
     data = []
     with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_order_engine) as tamp_order:
         tamp_user_session = tamp_user.session
-        res = tamp_user_session.execute('SELECT DISTINCT user_id, customer_id , realname, customer_name FROM (select f1.user_id, f1.customer_id, f2.realname,f3.customer_name from tamp_order.customer_order_view f1, tamp_user.user_info f2,tamp_user.customer_info f3   where f2.id=f1.user_id and f3.id=f1.customer_id) res;')
+        res = tamp_user_session.execute('SELECT DISTINCT user_id, customer_id , realname, customer_name FROM (select f1.user_id, f1.customer_id, f2.realname,f3.customer_name from tamp_order.customer_order_view f1, tamp_user.user_info f2,tamp_order.customer f3   where f2.id=f1.user_id and f3.id=f1.customer_id) res;')
         data = res.fetchall()
+    with TAMP_SQL(tamp_user_engine) as tamp_user:
+        tamp_user_session = tamp_user.session
+        sql = "SELECT `id` from user_info where team_id=0;"
+        cur = tamp_user_session.execute(sql)
+        ifa = cur.fetchall()
+        inner_ifa_df = pd.DataFrame(list(ifa), columns=["ifa_id"])
+    inner_ifa_list = list(inner_ifa_df["ifa_id"].values)
+
     for d in data:
+        if d[0] in inner_ifa_list:
+            print(d)
+            continue
         call_month_report(d[0], d[2], d[1], d[3])