优化联通订单查询功能

AdminController/UnicomManageController.py

@@ -11,6 +11,7 @@ from django.views.generic.base import View
 
 from Model.models import UnicomDeviceInfo, UnicomCombo, Pay_Type, UnicomComboOrderInfo, Device_User, Device_Info
 from Object.ResponseObject import ResponseObject
+from Service.CommonService import CommonService
 
 
 class UnicomManageControllerView(View):
@@ -109,7 +110,8 @@ class UnicomManageControllerView(View):
                     'createdTime': unicom_device.created_time,
                     'updatedTime': unicom_device.updated_time
                 }
-                device_user_qs = Device_User.objects.filter(userID=unicom_device.user_id).values('username', 'NickName', 'phone')
+                device_user_qs = Device_User.objects.filter(userID=unicom_device.user_id).values('username', 'NickName',
+                                                                                                 'phone')
                 data['userName'] = device_user_qs[0]['username'] if device_user_qs.exists() else ''
                 data['NickName'] = device_user_qs[0]['NickName'] if device_user_qs.exists() else ''
                 data['phone'] = device_user_qs[0]['phone'] if device_user_qs.exists() else ''
@@ -122,7 +124,7 @@ class UnicomManageControllerView(View):
     @staticmethod
     def get_order_info(request_dict, response):
         """
-        获取/筛选设备套餐订单信息
+        获取/筛选4G流量卡订单信息
         @param request_dict:
         @param response:
         @return:
@@ -141,7 +143,7 @@ class UnicomManageControllerView(View):
 
         try:
             combo_order_info_qs = UnicomComboOrderInfo.objects.all()
-            # 筛选查询
+            # 序列号查询
             if serial_no:
                 unicom_device_qs = UnicomDeviceInfo.objects.filter(serial_no__icontains=serial_no).values('serial_no',
                                                                                                           'user_id',
@@ -149,6 +151,7 @@ class UnicomManageControllerView(View):
                 if not unicom_device_qs.exists():
                     return response.json(0, [])
                 combo_order_info_qs = combo_order_info_qs.filter(iccid__icontains=unicom_device_qs[0]['iccid'])
+            # UID查询
             if UID:
                 device_qs = Device_Info.objects.filter(UID=UID).values('serial_number').distinct()
                 if not device_qs.exists():
@@ -158,6 +161,7 @@ class UnicomManageControllerView(View):
                 if not unicom_device_qs.exists():
                     return response.json(0, [])
                 combo_order_info_qs = combo_order_info_qs.filter(iccid__icontains=unicom_device_qs[0]['iccid'])
+            # 状态查询
             if status:
                 status = int(status)
                 combo_order_info_qs = combo_order_info_qs.filter(status=status)
@@ -168,7 +172,7 @@ class UnicomManageControllerView(View):
             data_list = []
             for combo_order in combo_order_info_qs:
                 data = {'userName': '',
-                        'serialNo': '',
+                        'price': '',
                         'UID': '',
                         'iccid': combo_order.iccid,
                         'status': combo_order.status,
@@ -184,13 +188,15 @@ class UnicomManageControllerView(View):
                 unicom_device_qs = UnicomDeviceInfo.objects.filter(iccid__icontains=combo_order.iccid).values('user_id',
                                                                                                               'serial_no')
                 userID = unicom_device_qs[0]['user_id'] if unicom_device_qs.exists() else ''
-                device_user = Device_User.objects.filter(userID=userID).values('username')
-                if device_user.exists():
-                    nick_name = device_user[0]['username']
-                    data['userName'] = nick_name
                 data['serialNo'] = unicom_device_qs[0]['serial_no'] if unicom_device_qs.exists() else ''
-                device_qs = Device_Info.objects.filter(serial_number=unicom_device_qs[0]['serial_no']).values('UID')
-                data['UID'] = device_qs[0]['UID'] if device_qs.exists() else ''
+                serial_no = data['serialNo']
+                device_info_qs = Device_Info.objects.filter(userID__userID=userID, serial_number=serial_no).values(
+                    'userID__username', 'UID')
+                if device_info_qs.exists():
+                    nick_name = device_info_qs[0]['userID__username']
+                    data['userName'] = nick_name
+                if data['serialNo'] != '':
+                    data['UID'] = CommonService.query_serial_with_uid(data['serialNo'])
                 data_list.append(data)
             return response.json(0, {'list': data_list, 'total': total})
         except Exception as e:
@@ -367,9 +373,9 @@ class UnicomManageControllerView(View):
     def static_info(self, request_dict, response):
         """
         统计联通套餐
-        @param request_dict:
-        @param response:
-        @return:
+        @param request_dict:请求参数
+        @param response: 响应对象
+        @param return:
         """
         year = request_dict.get('year', None)
         Jan = int(time.mktime(time.strptime(year + '-1-1 00:00:00', "%Y-%m-%d %H:%M:%S")))