add

make_data.py

@@ -64,7 +64,7 @@ def v1_doctor():
           "from statistic_doctor_rank_factor d " \
     "left join hippo_merchantrelevance b on d.doctor_id = b.doctor_id " \
     "left join al_meigou_service_smart_rank_budan_payment budan on b.merchant_id = budan.merchant_id " \
-    "where d.partition_date = '{}' and budan.stat_date = '{}' limit 6;".format(date_str, date_tmp)
+    "where d.partition_date = '{}' and budan.stat_date = '{}';".format(date_str, date_tmp)
 
     db = pymysql.connect(host='172.16.30.143', port=3306, user='work', passwd='BJQaT9VzDcuPBqkd', db='zhengxing')
     cursor = db.cursor()
@@ -75,20 +75,24 @@ def v1_doctor():
             "merchant_id","budan_payment_30_days"]
 
     df = df.rename(columns=dict(zip(list(range(len(name))), name)))
-    print(df)
+    print(df.head(6))
 
     sql = "select merchant_id,doctor_ad_money_30_days,expand_rechange_amount_30," \
           "service_pv_30,expert_pv_30,organization_pv_30 from statistic_merchant_rank_factor " \
-          "where partition_date = '{}' limit 6;".format(date_str)
+          "where partition_date = '{}';".format(date_str)
     print(sql)
     cursor = db.cursor()
     cursor.execute(sql)
     result = cursor.fetchall()
+    db.close()
     tmp = pd.DataFrame(list(result))
     name = ["merchant_id", "doctor_ad_money_30_days", "expand_rechange_amount_30", "service_pv_30",
             "mexpert_pv_30", "organization_pv_30"]
     tmp = tmp.rename(columns=dict(zip(list(range(len(name))), name)))
-    print(tmp)
+    print(tmp.head(6))
+
+    df = pd.merge(df, tmp, on='merchant_id')
+    print(df.head(6))
 
     # for i in ["service_exposure_pv_30", "service_ctr_30", "expert_exposure_pv_30", "expert_pv_30",
     #   "doctor_ad_money_30_days", "expand_rechange_amount_30", "service_pv_30",