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

bug fix

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

@@ -276,10 +276,10 @@ object ARPU_COM {
 
       val diary_clk_all = sc.sql(
         s"""
-           |select count(md.payment) as pay_all,count(distinct(md.device_id)) as pay_people,count(md.payment)/count(distinct(md.device_id))
+           |select sum(md.gengmei_price) as pay_all,count(distinct(md.device_id)) as pay_people,sum(md.gengmei_price)/count(distinct(md.device_id))
            |from online.ml_meigou_order_detail md left join final_id
            |on md.device_id = final_id.device_id
-           |where md.status='2'
+           |where md.status= 2
            |and final_id.device_id is  null
            |and md.partition_date = '20181218'
            |and  md.pay_time  is  not  null