Merge branch 'weiyimin' into 'master'

push codes

See merge request !36

pm/daily_content_data/etl/daily_content_data.sql

@@ -614,7 +614,7 @@ LEFT JOIN
 			AND partition_date < regexp_replace((current_date),'-','')
 	        AND page_name = 'home'
 			AND action = 'on_click_card'
-			AND params['transaction_type'] not in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr')
+			AND params['transaction_type'] not in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr','fmctr')
 			AND params['card_content_type'] IN ('diary','diary_topic','user_post','doctor_post','question','answer','qa','live','article')
 
 			UNION ALL
@@ -626,7 +626,7 @@ LEFT JOIN
 			AND partition_date < regexp_replace((current_date),'-','')
 	        AND page_name = 'home'
 			AND action in ( 'on_click_diary_card','on_click_answer_card','on_click_question_card','on_click_topic_card','on_click_live_card')
-			AND params['transaction_type'] not in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr')
+			AND params['transaction_type'] not in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr','fmctr')
 
 			UNION ALL
 
@@ -637,7 +637,7 @@ LEFT JOIN
 			AND partition_date < regexp_replace((current_date),'-','')
 			AND page_name = 'home'
 			AND action = 'on_click_card'
-			AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr')
+			AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr','fmctr')
 			AND params['card_content_type'] IN ('diary','diary_topic','user_post','doctor_post','question','answer','qa','live','article')
 
 			UNION ALL
@@ -649,7 +649,7 @@ LEFT JOIN
 			AND partition_date < regexp_replace((current_date),'-','')
 	        AND page_name = 'home'
 			AND action in ('on_click_diary_card','on_click_answer_card','on_click_question_card','on_click_topic_card','on_click_live_card')
-			AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr')
+			AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed','samecity_ctcvr','fmctr')
 		)t2
 		ON t1.partition_date=t2.partition_date
 		  AND t1.device_id=t2.cl_id

pm/daily_recommend_strategy/etl/daily_recommend_strategy.sql

@@ -271,7 +271,7 @@ FROM
             FROM online.bl_hdfs_maidian_updates
             WHERE partition_date=regexp_replace(DATE_SUB(current_date,1) ,'-','')
             AND (action='on_click_card'and  params['card_content_type']='service'
-                   or action='on_click_button' and params['button_name']='unfold'
+                   or action='on_click_button' and params['button_name']='unfold' and page_name in ('diary_detail','topic_detail','post_detail','user_post_detail','doctor_post_detail')
                    or action='on_click_button' and params['button_name'] = 'more_recommendations')
             AND page_name IN ('diary_detail','topic_detail','post_detail','user_post_detail','doctor_post_detail','question_detail','answer_detail','question_answer_detail')
             AND (referrer='home' or