Merge branch 'abtest-136-137-opt-20220916' into test

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

@@ -82,9 +82,9 @@ def get_user_has30day_return(mid):
     # 获取redis中存储的状态值
     user_key = f"{config_.KEY_NAME_PREFIX_USER_HAS30DAY_RETURN}{mid}"
     redis_helper = RedisHelper()
-    if redis_helper.key_exists(key_name=user_key):
-        data = redis_helper.get_data_from_redis(key_name=user_key)
-        return data
+    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)
@@ -93,8 +93,12 @@ def get_user_has30day_return(mid):
         if result['code'] != 0:
             return None
         data = result['data']
-        redis_helper.set_data_to_redis(key_name=user_key, value=data, expire_time=2 * 3600)
-        return 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):