Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

change test

eda/feededa/src/main/scala/com/gmei/data_feed_exposure_precise.scala

@@ -568,6 +568,16 @@ object icon_train_data {
       )
       meigou_jiache.createOrReplaceTempView("meigou_jiache")
 
+      val zixun_meigou=sc.sql(
+        s"""
+           |SELECT cl_id as device_id,params['service_id'] as service_id
+           |from online.tl_hdfs_maidian_view
+           |where partition_date='${partition_date}'
+           |and (action='welfare_detail_click_phone' or action='welfare_detail_click_consult' or action='welfare_detail_click_message' or action='welfare_detail_click_curearea_contact')
+       """.stripMargin
+      )
+      zixun_meigou.createOrReplaceTempView("zixun_meigou")
+
       val meigou_all=sc.sql(
         s"""
            |SELECT * from meigou_click
@@ -575,6 +585,8 @@ object icon_train_data {
            |select * from megou_order
            |union all
            |select * from meigou_jiache
+           |union all
+           |select * from zixun_meigou
        """.stripMargin
       )
       meigou_all.createOrReplaceTempView("meigou_all")
@@ -874,15 +886,15 @@ object test_data {
 //      megou_order.show()
 
 //咨询美购数据
-      val zixun_click=sc.sql(
+      val zixun_meigou=sc.sql(
         s"""
-           |SELECT partition_date,cl_id as device_id,params['service_id'] as service_id
+           |SELECT cl_id as device_id,params['service_id'] as service_id
            |from online.tl_hdfs_maidian_view
            |where partition_date='${partition_date}'
            |and (action='welfare_detail_click_phone' or action='welfare_detail_click_consult' or action='welfare_detail_click_message' or action='welfare_detail_click_curearea_contact')
        """.stripMargin
       )
-      zixun_click.show()
+      zixun_meigou.show()
 
 // 百科点击数据