|
@@ -178,7 +178,6 @@ class UnicomManageControllerView(View):
|
|
data_list = []
|
|
data_list = []
|
|
for combo_order in combo_order_info_qs:
|
|
for combo_order in combo_order_info_qs:
|
|
data = {'userName': '',
|
|
data = {'userName': '',
|
|
- 'price': '',
|
|
|
|
'UID': '',
|
|
'UID': '',
|
|
'iccid': combo_order.iccid,
|
|
'iccid': combo_order.iccid,
|
|
'status': combo_order.status,
|
|
'status': combo_order.status,
|
|
@@ -189,7 +188,8 @@ class UnicomManageControllerView(View):
|
|
'expireTime': combo_order.expire_time,
|
|
'expireTime': combo_order.expire_time,
|
|
'createdTime': combo_order.created_time,
|
|
'createdTime': combo_order.created_time,
|
|
'updated_time': combo_order.updated_time}
|
|
'updated_time': combo_order.updated_time}
|
|
- unicom_combo_qs = UnicomCombo.objects.filter(id=combo_order.combo_id).values('combo_name')
|
|
|
|
|
|
+ unicom_combo_qs = UnicomCombo.objects.filter(id=combo_order.combo_id).values('combo_name', 'price')
|
|
|
|
+ data['price'] = unicom_combo_qs[0]['price'] if unicom_combo_qs.exists() else ''
|
|
data['comboName'] = unicom_combo_qs[0]['combo_name'] if unicom_combo_qs.exists() else ''
|
|
data['comboName'] = unicom_combo_qs[0]['combo_name'] if unicom_combo_qs.exists() else ''
|
|
unicom_device_qs = UnicomDeviceInfo.objects.filter(iccid__icontains=combo_order.iccid).values('user_id',
|
|
unicom_device_qs = UnicomDeviceInfo.objects.filter(iccid__icontains=combo_order.iccid).values('user_id',
|
|
'serial_no')
|
|
'serial_no')
|