解决全球数据排序问题

AdminController/dataSystemManagement/ServiceDataController.py

@@ -523,9 +523,9 @@ class ServiceDataView(View):
                     return response.json(result['result_code'])
             res = {
                 'orders': order_list,
-                'regions': region_list,
-                'deviceType': device_type_list,
-                'storeMeal': store_meal_list,
+                'regions': CommonService.list_sort(region_list),
+                'deviceType': CommonService.list_sort(device_type_list),
+                'storeMeal': CommonService.list_sort(store_meal_list)
             }
             return response.json(0, res)
         except Exception as e:
@@ -599,8 +599,8 @@ class ServiceDataView(View):
                     return response.json(result['result_code'])
             res = {
                 'orders': order_list,
-                'regions': region_list,
-                'deviceType': device_type_list,
+                'regions': CommonService.list_sort(region_list),
+                'deviceType': CommonService.list_sort(device_type_list)
             }
             return response.json(0, res)
         except Exception as e:
@@ -674,8 +674,8 @@ class ServiceDataView(View):
                     return response.json(result['result_code'])
             res = {
                 'orders': order_list,
-                'regions': region_list,
-                'deviceType': device_type_list,
+                'regions': CommonService.list_sort(region_list),
+                'deviceType': CommonService.list_sort(device_type_list),
             }
             return response.json(0, res)
         except Exception as e:
@@ -755,8 +755,8 @@ class ServiceDataView(View):
             repeat_rate = round(repeat_count / order_count * 100, 2)
             res = {
                 'orders': order_list,
-                'regions': region_list,
-                'deviceType': device_type_list,
+                'regions': CommonService.list_sort(region_list),
+                'deviceType': CommonService.list_sort(device_type_list),
                 'repeatRate': repeat_rate,
                 'repeatCount': repeat_count,
                 'orderCount': order_count

AdminController/dataSystemManagement/UserDataController.py

@@ -240,7 +240,7 @@ class UserDataView(View):
                     return response.json(result['result_code'])
             res = {
                 'user': user_list,
-                'region': region_list
+                'region': CommonService.list_sort(region_list)
             }
             return response.json(0, res)
         except Exception as e:
@@ -299,7 +299,7 @@ class UserDataView(View):
                     return response.json(result['result_code'])
             res = {
                 'user': user_list,
-                'region': region_list
+                'region': CommonService.list_sort(region_list)
             }
             return response.json(0, res)
         except Exception as e:
@@ -343,7 +343,7 @@ class UserDataView(View):
                 else:
                     return response.json(result['result_code'])
             res = {
-                'countries': user_list
+                'countries': CommonService.list_sort(user_list[:20])
             }
             return response.json(0, res)
         except Exception as e:

Service/CommonService.py

@@ -720,3 +720,11 @@ GCqvlyw5dfxNA+EtxNE2wCW/LW7ENJlACgcfgPlBZtpLheWoZB/maw4=
         else:
             domain_name_list = []
         return domain_name_list
+
+    @staticmethod
+    def list_sort(e):
+        """
+        按时间单位切割时间段
+        @param e: 列表元素
+        """
+        return sorted(e, key=lambda item: -item['count'])