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

write to prod

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

@@ -276,7 +276,7 @@ object ARPU_COM {
 
       val diary_clk_all = sc.sql(
         s"""
-           |select sum(md.gengmei_price) as pay_all count(distinct(md.device_id)) as consum_num
+           |select sum(md.gengmei_price) as pay_all,count(distinct(md.device_id)) as consum_num
            |from online.ml_meigou_order_detail md left join final_id
            |on md.device_id = final_id.device_id
            |where md.status= 2
@@ -292,7 +292,7 @@ object ARPU_COM {
 
       val active_num = sc.sql(
         s"""
-           |select count(device_id) as active_num
+           |select count(distinct(device_id)) as active_num
            |from online.ml_device_month_active_status
            |where partition_date = '20180131'
            |and first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3','wanpu','jinshan','jx','maimai','zhuoyi','huatian','suopingjingling','mocha','mizhe','meika','lamabang','js-az1','js-az2','js-az3','js-az4','js-az5','jfq-az1','jfq-az2','jfq-az3','jfq-az4','jfq-az5','toufang1' ,'toufang2','toufang3','toufang4','toufang5','toufang6','TF-toufang1','TF-toufang2','TF-toufang3','TF-toufang4','TF-toufang5','tf-toufang1','tf-toufang2','tf-toufang3','tf-toufang4','tf-toufang5','benzhan','promotion_aso100' ,'promotion_qianka','promotion_xiaoyu','promotion_dianru','promotion_malioaso','promotion_malioaso-shequ' ,'promotion_shike','promotion_julang_jl03')