优化查询订单利润及成本

AdminController/dataSystemManagement/OperatingCostsDataController.py

@@ -68,11 +68,11 @@ class OperatingCostsDataView(View):
             else:
                 operating_costs_qs = OperatingCosts.objects.all()
             count = operating_costs_qs.count()
-            order_list = list(operating_costs_qs.values_list('order_id', flat=True).order_by('-order_id'))[:page * line]
+            order_list = list(operating_costs_qs.values_list('order_id', flat=True).order_by('-time'))[:page * line]
             operating_qs = operating_costs_qs.values('order_id', 'uid', 'day_average_price', 'month_average_price',
                                                      'purchase_quantity', 'actual_storage', 'actual_api',
                                                      'monthly_income', 'settlement_days', 'remaining_usage_time',
-                                                     'end_time', 'created_time', 'time').order_by('-order_id')[
+                                                     'end_time', 'created_time', 'time').order_by('-time')[
                            :page * line]
             all_order_qs = Order_Model.objects.filter(orderID__in=order_list)
             country_qs = CountryModel.objects.values('id', 'country_name')
@@ -147,7 +147,8 @@ class OperatingCostsDataView(View):
                     if eur_result['result_code'] == 0:
                         res += eur_result['result']['res']
                         count += eur_result['result']['count']
+                        res = CommonService.list_sort_v2(res, 'time')
             return response.json(0, {'count': count,
-                                     'res': CommonService.list_sort_v2(res, 'order_id')[(page - 1) * line:page * line]})
+                                     'res': res[(page - 1) * line:page * line]})
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))

Service/CommonService.py

@@ -753,7 +753,7 @@ GCqvlyw5dfxNA+EtxNE2wCW/LW7ENJlACgcfgPlBZtpLheWoZB/maw4=
         @param e: 列表元素
         @param order_by: 排序对象
         """
-        return sorted(e, key=lambda item: -int(item[order_by]))
+        return sorted(e, key=lambda item: item[order_by], reverse=True)
 
     @staticmethod
     def Package_Type(order_type, content):