Merge branch 'abtest-136-137-opt-20220916' into pre-master

config.py

@@ -592,6 +592,9 @@ class BaseConfig(object):
     # 限流视频分发数记录 redis key前缀，完整格式：'limit:video:distribute:count:{videoId}'
     KEY_NAME_PREFIX_LIMIT_VIDEO_DISTRIBUTE_COUNT = 'limit:video:distribute:count:'
 
+    # 用户近30天是否有回流状态 存放 redis key 前缀，完整格式：'user:has30day:return:{mid}'
+    KEY_NAME_PREFIX_USER_HAS30DAY_RETURN = 'user:has30day:return:'
+
     # 视频数据表类型 - 管理后台算法视频列表可视化
     VIDEO_DATA_LIST_MAPPING = {
         0: {
@@ -618,28 +621,6 @@ class BaseConfig(object):
 
     }
 
-    # VIDEO_DATA_LIST_AB_EXP_CODE_MAPPING = {
-    #     # "055": {"app_type": 0, "data_key": "data1", "rule_key": "rule2"},
-    #     "068": {"app_type": 5, "data_key": "data1", "rule_key": "rule3"},
-    #     "069": {"app_type": 19, "data_key": "data1", "rule_key": "rule3"},
-    #     "072": {"app_type": 4, "data_key": "data1", "rule_key": "rule3"},
-    #     "073": {"app_type": 6, "data_key": "data1", "rule_key": "rule3"},
-    #     "074": {"app_type": 18, "data_key": "data1", "rule_key": "rule3"},
-    #     "079": {"app_type": 0, "data_key": "data1", "rule_key": "rule3"},
-    #     # "081": {"app_type": 5, "data_key": "data2", "rule_key": "rule3"},
-    #     "082": {"app_type": 5, "data_key": "data3", "rule_key": "rule3"},
-    #     "083": {"app_type": 5, "data_key": "data4", "rule_key": "rule3"},
-    #     "084": {"app_type": 0, "data_key": "data2", "rule_key": "rule3"},
-    #     "089": {"app_type": 19, "data_key": "data2", "rule_key": "rule3"},
-    #     "090": {"app_type": 19, "data_key": "data3", "rule_key": "rule3"},
-    #     "095": {"app_type": 0, "data_key": "data1", "rule_key": "rule4"},
-    #     "096": {"app_type": 4, "data_key": "data2", "rule_key": "rule3"},
-    #     "097": {"app_type": 4, "data_key": "data3", "rule_key": "rule3"},
-    #     "098": {"app_type": 6, "data_key": "data2", "rule_key": "rule3"},
-    #     "099": {"app_type": 6, "data_key": "data3", "rule_key": "rule3"},
-    #     "100": {"app_type": 18, "data_key": "data2", "rule_key": "rule3"},
-    #     "105": {"app_type": 0, "data_key": "data1", "rule_key": "rule5"},
-    # }
     REGION_CODE = {
         '北京': '110000', '天津': '120000', '河北省': '130000', '山西省': '140000', '内蒙古': '150000',
         '辽宁省': '210000', '吉林省': '220000', '黑龙江省': '230000',

recommend.py

@@ -565,7 +565,7 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, mid, page_ty
 
             if '136' in ab_exp_code_list:
                 # 无回流
-                if user_30day_return_result is False:
+                if user_30day_return_result == 0:
                     param = config_.AB_EXP_CODE.get('136')
                     ab_code = param.get('ab_code')
                     expire_time = 3600
@@ -574,7 +574,7 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, mid, page_ty
                     no_op_flag = True
             elif '137' in ab_exp_code_list:
                 # 有回流
-                if user_30day_return_result is True:
+                if user_30day_return_result == 1:
                     param = config_.AB_EXP_CODE.get('137')
                     ab_code = param.get('ab_code')
                     expire_time = 3600

utils.py

@@ -77,14 +77,28 @@ def get_user_has30day_return(mid):
     :param mid: mid
     :return: data, type
     """
-    request_url = f"{config_.GET_USER_30DayReturnCnt_URL}{mid}"
-    result = request_get(request_url=request_url, timeout=0.1)
-    if result is None:
-        return None
-    if result['code'] != 0:
+    if not mid:
         return None
-    data = result['data']
-    return data
+    # 获取redis中存储的状态值
+    user_key = f"{config_.KEY_NAME_PREFIX_USER_HAS30DAY_RETURN}{mid}"
+    redis_helper = RedisHelper()
+    data = redis_helper.get_data_from_redis(key_name=user_key)
+    if data is not None:
+        return int(data)
+    else:
+        request_url = f"{config_.GET_USER_30DayReturnCnt_URL}{mid}"
+        result = request_get(request_url=request_url, timeout=0.1)
+        if result is None:
+            return None
+        if result['code'] != 0:
+            return None
+        data = result['data']
+        if data is True:
+            redis_data = 1
+        else:
+            redis_data = 0
+        redis_helper.set_data_to_redis(key_name=user_key, value=redis_data, expire_time=2 * 3600)
+        return redis_data
 
 
 def get_videos_remain_view_count(app_type, videos):