Merge branch 'dev' into test

config.py

@@ -112,7 +112,7 @@ class BaseConfig(object):
     # 小时级更新过去24h数据规则参数
     RULE_PARAMS_24H = {
         'rule1': {'cal_score_func': 2, 'return_count': 100, 'platform_return_rate': 0.001},
-        'rule2': {'cal_score_func': 2, 'return_count': 100, 'platform_return_rate': 0.001, 'view_type': 'video-show'},
+        'rule2': {'cal_score_func': 2, 'return_count': 100, 'platform_return_rate': 0.001, 'view_type': 'preview'},
     }
 
     # 地域分组小时级规则更新使用数据

rule_rank_h_by_24h.py

@@ -108,6 +108,8 @@ def cal_score2(df, param):
     df = df.fillna(0)
     if param.get('view_type', None) == 'video-show':
         df['share_rate'] = df['share次数'] / (df['platform_show'] + 1000)
+    elif param.get('view_type', None) == 'preview':
+        df['share_rate'] = df['share次数'] / (df['preview人数'] + 1000)
     else:
         df['share_rate'] = df['share次数'] / (df['view人数'] + 1000)
     df['back_rate'] = df['回流人数'] / (df['share次数'] + 100)