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

add eda file

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

@@ -784,34 +784,35 @@ object bug_again_count {
 
       val spam_order_id = sc.sql(
         s"""
-           |select distinct(order_id)
+           |select count(order_id)
            |from mining.ml_order_spam_recognize
            |where partition_date='${partition_date}'
        """.stripMargin
         )
       spam_order_id.createOrReplaceTempView("spam_order_id")
+      spam_order_id.show()
 
       val meigou_id_order = sc.sql(
         s"""
-           |select a.user_id from (select od.user_id,count(od.order_id) as order_num
-           |from online.ml_meigou_order_detail od left join spam_order_id
+           |select od.user_id,count(od.order_id) as order_num
+           |from online.ml_meigou_order_detail  od left join spam_order_id
            |on od.order_id=spam_order_id.order_id
-           |where od.status='2'
+           |where od.status="2"
            |and od.partition_date='${partition_date}'
            |and spam_order_id.order_id is null
            |group by od.user_id
-           |order by order_num) a
-           |where a.order_num>=2
+           |order by order_num
        """.stripMargin
       )
       meigou_id_order.createOrReplaceTempView("meigou_id_order")
+      meigou_id_order.show()
 
       val diary_id = sc.sql(
         s"""
            |select sd.id,sd.user_id
            |from src_mimas_prod_api_diary sd inner join meigou_id_order
            |on sd.user_id=meigou_id_order.user_id
-           |where sd.content_level>='3.5'
+           |where sd.content_level>="3.5"
        """.stripMargin
       )
       diary_id.show()