Merge branch 'weiyimin' into 'master'

push codes

See merge request !22

pm/daily_recommend_strategy/etl/daily_recommend_strategy.sql

@@ -66,6 +66,7 @@ FROM
                        when transaction_type in ('newdata') then '保量卡片'
                        when transaction_type in ('samecity_ctr') then 'samecity_ctr'
                        when transaction_type in ('samecity_cvr') then 'samecity_cvr'
+                       when transaction_type in ('hotspot_feed') then 'hotspot_feed'
                   END AS recommend_type,
                   card_id,
                   app_session_id
@@ -75,7 +76,7 @@ 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')
+           AND transaction_type in ('-1','ctr','smr','cvr','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,
@@ -86,7 +87,8 @@ FROM
                        when transaction_type in ('pgc','hotspot') then '热点卡片'
                        when transaction_type in ('newdata') then '保量卡片'
                        when transaction_type in ('samecity_ctr') then 'samecity_ctr'
-                       when transaction_type in ('samecity_cvr') then 'samecity_cvr' END,
+                       when transaction_type in ('samecity_cvr') then 'samecity_cvr'
+                       when transaction_type in ('hotspot_feed') then 'hotspot_feed' END,
                   card_id,
                   app_session_id
         )a
@@ -113,6 +115,7 @@ FROM
                        when params['transaction_type'] in ('newdata') then '保量卡片'
                        when params['transaction_type'] in ('samecity_ctr') then 'samecity_ctr'
                        when params['transaction_type'] in ('samecity_cvr') then 'samecity_cvr'
+                       when params['transaction_type'] in ('hotspot_feed') then 'hotspot_feed'
                   END AS recommend_type,
                   params['card_id'] as card_id,
                   app_session_id
@@ -121,7 +124,7 @@ 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')
+           AND params['transaction_type'] in ('-1','ctr','smr','cvr','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,
@@ -132,7 +135,8 @@ FROM
                        when params['transaction_type'] in ('pgc','hotspot') then '热点卡片'
                        when params['transaction_type'] in ('newdata') then '保量卡片'
                        when params['transaction_type'] in ('samecity_ctr') then 'samecity_ctr'
-                       when params['transaction_type'] in ('samecity_cvr') then 'samecity_cvr' END,
+                       when params['transaction_type'] in ('samecity_cvr') then 'samecity_cvr'
+                       when params['transaction_type'] in ('hotspot_feed') then 'hotspot_feed' END,
                   params['card_id'],
                   app_session_id
         )a