联通测试服，完善设备卡套餐

AdminController/UnicomManageController.py

@@ -208,27 +208,31 @@ class UnicomComboView(View):
                     return response.json(0, [])
                 unicom_device_qs = UnicomDeviceInfo.objects.filter().values('user_id', 'iccid',
                                                                             'serial_no')
-            data = {}
-            for unicom_device in unicom_device_qs:
-                userID = unicom_device['user_id']
-                device_user = Device_User.objects.filter(userID=userID).values('NickName')
-                nick_name = device_user[0]['NickName']
-                for combo_order in combo_order_qs:
-                    data = {'nickName': '',
-                            'iccid': combo_order['iccid'],
-                            'serialNo': '',
-                            'status': combo_order['status'],
-                            'order_id': combo_order['order_id'],
-                            'comboName': combo_order['combo__combo_name'],
-                            'flow_total_usage': combo_order['flow_total_usage'],
-                            'next_month_activate': combo_order['next_month_activate'],
-                            'activation_time': combo_order['activation_time'],
-                            'expire_time': combo_order['expire_time']}
-                data['serialNo'] = unicom_device['serial_no']
-                data['nickName'] = nick_name
+            data_list = []
+            # for unicom_device in unicom_device_qs:
+            #     userID = unicom_device['user_id']
+            #     device_user = Device_User.objects.filter(userID=userID).values('NickName')
+            #     nick_name = device_user[0]['NickName']
+            for combo_order in combo_order_qs:
+                data = {'nickName': '',
+                        'iccid': combo_order['iccid'],
+                        'serialNo': '',
+                        'status': combo_order['status'],
+                        'order_id': combo_order['order_id'],
+                        'comboName': combo_order['combo__combo_name'],
+                        'flow_total_usage': combo_order['flow_total_usage'],
+                        'next_month_activate': combo_order['next_month_activate'],
+                        'activation_time': combo_order['activation_time'],
+                        'expire_time': combo_order['expire_time']}
+                for unicom_device in unicom_device_qs:
+                    userID = unicom_device['user_id']
+                    device_user = Device_User.objects.filter(userID=userID).values('NickName')
+                    nick_name = device_user[0]['NickName']
+                    data['serialNo'] = unicom_device['serial_no']
+                    data['nickName'] = nick_name
+                data_list.append(data)
                 total = combo_order_qs.count()
-
-                return response.json(0, {'list': data, 'total': total})
+                return response.json(0, {'list': data_list, 'total': total})
         except Exception as e:
             print(e)
             return response.json(500, repr(e))