Browse Source

更新APP初始化接口、云存问卷返回对应语言

zhangdongming 2 years ago
parent
commit
7fe3c05e84
2 changed files with 27 additions and 5 deletions
  1. 21 0
      Controller/AppSetController.py
  2. 6 5
      Controller/Surveys/CloudStorageController.py

+ 21 - 0
Controller/AppSetController.py

@@ -39,6 +39,8 @@ class AppSetView(View):
         user_id = tko.userID
         if operation == 'page_set':  # app弹窗标记红点设置
             return self.do_page_set(user_id, request_dict, response)
+        elif operation == 'ai-preview':
+            return self.save_user_popups_log(user_id, request_dict, response)
         elif operation == 'admin_query':
             return self.do_admin_query(user_id, request_dict, response)
         elif operation == 'admin_update':
@@ -251,3 +253,22 @@ class AppSetView(View):
         order_qs = Order_Model.objects.filter(userID_id=user_id, order_type=2, status=1, payType=10)
         ai_red_dot_qs = UserOperationLog.objects.filter(user_id=user_id, type=4)
         return not ai_red_dot_qs.exists() and not order_qs.exists()
+
+    @classmethod
+    def save_user_popups_log(cls, user_id, request_dict, response):
+        """
+        保存用户预览AI介绍页面记录
+        @param request_dict: type
+        @param user_id: 用户id
+        @param response: 响应对象
+        """
+        try:
+            rq_type = request_dict.get('type', 0)
+            now_time = int(time.time())
+            user_log = {'user_id': user_id, 'status': 1, 'type': int(rq_type), 'created_time': now_time,
+                        'updated_time': now_time}
+            UserOperationLog.objects.create(**user_log)
+        except Exception as e:
+            LOGGER.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+            return response.json(500)
+        return response.json(0)

+ 6 - 5
Controller/Surveys/CloudStorageController.py

@@ -50,7 +50,7 @@ class CloudStorageView(View):
         ''' API '''
         logger.info('---- this user id:{},dict{}'.format(userID, request_dict))
         if operation == 'get/info':
-            return self.check_stock_user(userID, response)
+            return self.check_stock_user(userID, request_dict, response)
         if operation == 'cloud/answer/save':
             ip = CommonService.get_ip_address(request)
             return self.answer_save(userID, ip, request_dict, response)
@@ -60,11 +60,12 @@ class CloudStorageView(View):
             return self.entrance_cloud_storage_icon(userID, request_dict, response)
         return response.json(0)
 
-    def check_stock_user(self, user_id, response):
+    def check_stock_user(self, user_id, request_dict, response):
         order = Order_Model.objects.filter(userID=user_id, status=1, order_type=0)
         if not order.exists() and order.count() == 0:
             return response.json(10030)
         try:
+            lang = request_dict.get('lang', 'en')
             no = '01'
             surveys = Surveys.objects.filter(no=no, user_type=1)
             if not surveys.exists():
@@ -88,7 +89,7 @@ class CloudStorageView(View):
                 'endTime': result.end_time,
                 'isShow': 0 if close else result.is_show,
                 'isSubmit': submit,
-                'page': '/surveys?token=' if result.is_show == 1 else ''
+                'page': '/surveys?lang=' + lang + '&token=' if result.is_show == 1 else ''
             }
             localTime = int(time.time())
             if result.start_time <= localTime <= result.end_time:
@@ -196,8 +197,8 @@ class CloudStorageView(View):
         try:
             if status == 3:  #
                 cloud_vod_surveys_Operate_qs = CloudVodSurveysOperateLog.objects.filter(user_id=userID, status=status,
-                                                                           created_time__gte=start_time,
-                                                                           created_time__lte=end_time)
+                                                                                        created_time__gte=start_time,
+                                                                                        created_time__lte=end_time)
                 if not cloud_vod_surveys_Operate_qs.exists():  # 判断用户当天是否查阅问卷
                     cls.cloud_vob_operate_log_save(status=status, userId=userID)
                 else: