Merge branch 'weiyimin' into 'master'

Weiyimin

See merge request !24

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','cvr','smr','newdata','hotspot','pgc','samecity_ctr','samecity_cvr')
+			AND params['transaction_type'] not in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
 			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','cvr','smr','newdata','hotspot','pgc','samecity_ctr','samecity_cvr')
+			AND params['transaction_type'] not in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
 
 			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','cvr','smr','newdata','hotspot','pgc','samecity_ctr','samecity_cvr')
+			AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
 			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','cvr','smr','newdata','hotspot','pgc','samecity_ctr','samecity_cvr')
+			AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
 		)t2
 		ON t1.partition_date=t2.partition_date
 		  AND t1.device_id=t2.cl_id

pm/daily_content_data/job/step3.job

 #step3.job
 type=command
 dependencies=step2
-command=curl -X GET http://localhost:8553/api/report/email/daily_content_data/liudi@igengmei.com,wangxin@igengmei.com,dengguangyu@igengmei.com/weiyimin@igengmei.com,zhaofei@igengmei.com,yindanlei@igengmei.com
+command=curl -X GET http://localhost:8553/api/report/email/daily_content_data/liudi@igengmei.com,wangxin@igengmei.com,dengguangyu@igengmei.com,zhaoyang@igengmei.com/weiyimin@igengmei.com,zhaofei@igengmei.com,yindanlei@igengmei.com
\ No newline at end of file

pm/daily_recommend_strategy/etl/daily_recommend_strategy.sql

@@ -60,7 +60,7 @@ FROM
                   cl_id,
                   case when card_content_type in ('qa','answer') then 'qa' else card_content_type end as card_content_type,
                   CASE WHEN transaction_type in ('ctr')  THEN 'ctr预估'
-                       WHEN transaction_type in ('cvr') THEN 'cvr预估'
+                       WHEN transaction_type in ('cvr','ctcvr') THEN 'cvr预估'
                        WHEN transaction_type in ('-1','smr') THEN 'smr'
                        when transaction_type in ('pgc','hotspot') then '热点卡片'
                        when transaction_type in ('newdata') then '保量卡片'
@@ -76,13 +76,13 @@ FROM
            AND is_exposure = '1'  ----精准曝光
            AND page_name ='home'
            AND tab_name = '精选'
-           AND transaction_type in ('-1','ctr','smr','cvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
+           AND transaction_type in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
            AND card_content_type in ('qa','diary','user_post','answer')
            group by partition_date,
                   case when card_content_type in ('qa','answer') then 'qa' else card_content_type end,
                   cl_id,
                   CASE WHEN transaction_type in ('ctr')  THEN 'ctr预估'
-                       WHEN transaction_type in ('cvr') THEN 'cvr预估'
+                       WHEN transaction_type in ('cvr','ctcvr') THEN 'cvr预估'
                        WHEN transaction_type in ('-1','smr') THEN 'smr'
                        when transaction_type in ('pgc','hotspot') then '热点卡片'
                        when transaction_type in ('newdata') then '保量卡片'
@@ -109,7 +109,7 @@ FROM
                   cl_id,
                   case when params['card_content_type'] in ('qa','answer') then 'qa' else params['card_content_type'] end as card_content_type,
                   CASE WHEN params['transaction_type'] in ('ctr')  THEN 'ctr预估'
-                       WHEN params['transaction_type'] in ('cvr') THEN 'cvr预估'
+                       WHEN params['transaction_type'] in ('cvr','ctcvr') THEN 'cvr预估'
                        WHEN params['transaction_type'] in ('-1','smr') THEN 'smr'
                        when params['transaction_type'] in ('pgc','hotspot') then '热点卡片'
                        when params['transaction_type'] in ('newdata') then '保量卡片'
@@ -124,13 +124,13 @@ FROM
            AND action='on_click_card'
            AND params['page_name'] ='home'
            AND params['tab_name'] = '精选'
-           AND params['transaction_type'] in ('-1','ctr','smr','cvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
+           AND params['transaction_type'] in ('-1','ctr','smr','cvr','ctcvr','hotspot','pgc','newdata','samecity_ctr','samecity_cvr','hotspot_feed')
            AND params['card_content_type'] in ('qa','diary','user_post','answer')
            GROUP BY partition_date,
                   cl_id,
                   case when params['card_content_type'] in ('qa','answer') then 'qa' else params['card_content_type'] end,
                   CASE WHEN params['transaction_type'] in ('ctr')  THEN 'ctr预估'
-                       WHEN params['transaction_type'] in ('cvr') THEN 'cvr预估'
+                       WHEN params['transaction_type'] in ('cvr','ctcvr') THEN 'cvr预估'
                        WHEN params['transaction_type'] in ('-1','smr') THEN 'smr'
                        when params['transaction_type'] in ('pgc','hotspot') then '热点卡片'
                        when params['transaction_type'] in ('newdata') then '保量卡片'
@@ -229,8 +229,10 @@ FROM
             FROM online.bl_hdfs_maidian_updates
             WHERE partition_date=regexp_replace(DATE_SUB(current_date,1) ,'-','')
             AND (get_json_object(params['extra_param'], '$.type')='交互栏'
-                   or get_json_object(params['extra_param'], '$.jump_from')='msg_link'
-                   or params['in_page_pos']='top' or params['in_page_pos']='bottom')
+		       or get_json_object(params['extra_param'], '$.jump_from')='msg_link'
+		       or params['in_page_pos']='top'
+		       or (params['in_page_pos']='bottom' and params['position'] is null and cl_type='android')
+				or (params['in_page_pos']='bottom' and params['card_but_pos'] is not null and cl_type='ios'))
             AND action='on_click_card'
             and params['card_content_type']='service'
             AND page_name IN ('diary_detail','topic_detail')
@@ -261,7 +263,8 @@ 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'
+                   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
                   (params['referrer_link'] like '%[%' and

pm/meigou_detail_page/job/step2.job

 #step2.job
 type=command
 dependencies=step1_1,step1_2,step1_3
-command=curl -X GET http://localhost:8553/api/report/email/meigou_detail_page/liudi@igengmei.com,wangxin@igengmei.com,zhaofei@igengmei.com/weiyimin@igengmei.com,yindanlei@igengmei.com
+command=curl -X GET http://localhost:8553/api/report/email/meigou_detail_page/liudi@igengmei.com,wangxin@igengmei.com,zhaofei@igengmei.com/weiyimin@igengmei.com,yindanlei@igengmei.com,wangyan@igengmei.com
\ No newline at end of file