|
|
@@ -61,7 +61,7 @@ class OperatingCostsDataView(View):
|
|
|
line = int(line)
|
|
|
try:
|
|
|
if start_time and end_time:
|
|
|
- operating_costs_qs = OperatingCosts.objects.filter(time__gte=start_time, time__lte=end_time)
|
|
|
+ operating_costs_qs = OperatingCosts.objects.filter(time__gte=start_time, time__lt=end_time)
|
|
|
else:
|
|
|
operating_costs_qs = OperatingCosts.objects.all()
|
|
|
count = operating_costs_qs.count()
|
|
|
@@ -70,7 +70,7 @@ class OperatingCostsDataView(View):
|
|
|
'monthly_income', 'settlement_days', 'remaining_usage_time',
|
|
|
'end_time', 'created_time', 'start_time', 'time', 'storage_cost',
|
|
|
'api_cost', 'profit', 'profit_margin', 'fee', 'flow_cost',
|
|
|
- 'real_income', 'price', 'region', 'country_name',
|
|
|
+ 'real_income', 'price', 'region', 'country_name', 'actual_flow',
|
|
|
'order_type', 'expire')[(page - 1) * line:page * line]
|
|
|
return response.json(0, {'count': count, 'res': list(operating_qs)})
|
|
|
except Exception as e:
|
