|
|
@@ -183,7 +183,14 @@ class UnicomComboView(View):
|
|
|
line = int(pageSize)
|
|
|
|
|
|
try:
|
|
|
- combo_order_qs = UnicomComboOrderInfo.objects.all()
|
|
|
+ combo_order_qs = UnicomComboOrderInfo.objects.values('status',
|
|
|
+ 'iccid',
|
|
|
+ 'order_id',
|
|
|
+ 'flow_total_usage',
|
|
|
+ 'next_month_activate',
|
|
|
+ 'activation_time',
|
|
|
+ 'expire_time',
|
|
|
+ 'combo__combo_name')[(page - 1) * line:page * line]
|
|
|
|
|
|
if serial_no or status:
|
|
|
if serial_no:
|
|
|
@@ -200,15 +207,6 @@ class UnicomComboView(View):
|
|
|
return response.json(0, [])
|
|
|
unicom_device_qs = UnicomDeviceInfo.objects.filter().values('user_id', 'iccid',
|
|
|
'serial_no')
|
|
|
-
|
|
|
- combo_order_qs = combo_order_qs.filter().values('status',
|
|
|
- 'iccid',
|
|
|
- 'order_id',
|
|
|
- 'flow_total_usage',
|
|
|
- 'next_month_activate',
|
|
|
- 'activation_time',
|
|
|
- 'expire_time',
|
|
|
- 'combo__combo_name')[(page - 1) * line:page * line]
|
|
|
total = combo_order_qs.count()
|
|
|
data_list = []
|
|
|
for combo_order in combo_order_qs:
|
