Merge branch 'master' of http://192.168.136.99:3000/servers/ASJServer

AdminController/UserManageController.py

@@ -475,7 +475,7 @@ class UserManagement(View):
     def getFeedbackList(self, request_dict, response):
         status = request_dict.get('status', 0)
         username = request_dict.get('username', None)
-        collect_status = request_dict.get('collectStatus', 0)
+        collectStatus = request_dict.get('collectStatus', None)
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
         if not all([pageNo, pageSize]):
@@ -484,13 +484,13 @@ class UserManagement(View):
         line = int(pageSize)
         try:
             filter_data = {}
-            if status or username or collect_status:
+            if status or username or collectStatus:
                 if status:
                     filter_data['status'] = int(status)
                 if username:
                     filter_data['userID_id'] = ModelService.get_userID_byname(username)
-                if collect_status:
-                    filter_data['collect_status'] = int(collect_status)
+                if collectStatus:
+                    filter_data['collect_status'] = int(collectStatus)
             feed_back_qs = FeedBackModel.objects.filter()
             if filter_data:
                 feed_back_qs = feed_back_qs.filter(**filter_data).values()
@@ -692,15 +692,15 @@ class UserManagement(View):
 
     def exportFeedBack(self, request_dict, response):
         status = request_dict.get('status', None)
-        collect_status = request_dict.get('collectStatus', None)
+        collectStatus = request_dict.get('collectStatus', None)
         try:
             with transaction.atomic():
                 filter_data = {}
-                if status or collect_status:
+                if status or collectStatus:
                     if status:
                         filter_data['status'] = int(status)
-                    if collect_status:
-                        filter_data['collect_status'] = int(collect_status)
+                    if collectStatus:
+                        filter_data['collect_status'] = int(collectStatus)
                 feed_back_qs = FeedBackModel.objects.filter()
                 if filter_data:
                     feed_back_qs = feed_back_qs.filter(**filter_data)

Controller/CloudStorage.py

@@ -387,7 +387,7 @@ class CloudStorageView(View):
                         "Effect": "Allow",
                         "Action": "s3:*",
                         "Resource": ["{aws_arn}:::{bucket_name}/{uid_channel}*".
-                                     format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
+                                         format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
                     }
                 ]
             }
@@ -1588,13 +1588,14 @@ class CloudStorageView(View):
                 }
                 store_list.append(unused_dict)
                 bucket_id_list.append(ub['bucket__id'])
-        smqs = Store_Meal.objects.filter(bucket__id__in=bucket_id_list, lang__lang=lang).values('lang__lang',
-                                                                                                'bucket__id',
-                                                                                                'lang__title')
+        smqs = Store_Meal.objects.filter(bucket__id__in=bucket_id_list, lang__lang=lang).annotate(
+            title=F('lang__title'), content=F('lang__content')).values('lang__content', 'lang__lang',
+                                                                       'bucket__id',
+                                                                       'lang__title')
         for index, value in enumerate(store_list):
             for sm in smqs:
                 if value['bucket__id'] == sm['bucket__id']:
-                    value['bucket__content'] = sm['lang__title']
+                    value['bucket__content'] = sm['lang__title'] + '-' + sm['lang__content']
 
         return response.json(0, list(store_list))
 

Controller/OrderContrller.py

@@ -132,6 +132,7 @@ class OrderView(View):
                         d['serial_number'] = CommonService.get_full_serial_number(d['UID'], did['serial_number'], did['Type'])
                     data.append(d)
             d['rank__content'] = d['rank__lang__content']
+            d['rank__title'] = d['rank__title'] + '-' +d['rank__lang__content']
             del d['rank__lang__content']
             # d['rank__lang__content'] = '月' if lang == 'cn' else 'month'
         return response.json(0, {'data': data, 'count': count})

Controller/UserController.py

@@ -1507,10 +1507,14 @@ class v2forgetPwdCodeView(TemplateView):
         ses = SesClassObject()
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
         region_country = users['region_country']
-        lang_id = LanguageModel.objects.filter(lang=lang).values('id')
-        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=lang_id[0]['id']).values(
-            'country_name')
+        # 语言不存在返回英文
+        language_qs = LanguageModel.objects.filter(lang=lang).values('id')
+        if not language_qs.exists():
+            language_qs = LanguageModel.objects.filter(lang='en').values('id')
+        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=language_qs[0]['id']).\
+            values('country_name')
         res['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
+
         if not number or number == '0':
             res['status'] = 0
             user_qs.update(last_login=now_time, language=lang)
@@ -2133,7 +2137,10 @@ class v3LoginView(TemplateView):
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
         region_country = users['region_country']
-        lang_id = LanguageModel.objects.filter(lang=lang).values('id')
+        # 语言不存在返回英文
+        language_qs = LanguageModel.objects.filter(lang=lang).values('id')
+        if not language_qs.exists():
+            language_qs = LanguageModel.objects.filter(lang='en').values('id')
 
         # 更新最后登录时间
         if not number or number == '0':
@@ -2147,8 +2154,8 @@ class v3LoginView(TemplateView):
             else:   # 一致
                 res['status'] = 0
                 user_qs.update(last_login=now_time, language=response.lang, region_country=number)
-        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=lang_id[0]['id']).values(
-            'country_name')
+        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=language_qs[0]['id']).\
+            values('country_name')
 
         res['rid'] = users['role__rid']
         res['roleName'] = users['role__roleName']

Model/models.py

@@ -646,6 +646,7 @@ class FeedBackModel(models.Model):
     appBundleId = models.CharField(max_length=32, default='', verbose_name='app版本appBundleId')
     email = models.CharField(max_length=32, default='', verbose_name='app版本email')
     score = models.CharField(max_length=32, default='0', verbose_name='评分--星星数')
+    collect_status = models.SmallIntegerField(default=0, verbose_name='收藏[0:未收藏, 1:已收藏]')
 
     def __str__(self):
         return self.id