Эх сурвалжийг харах

完善卡用户信息查询和用户信息数量

guanhailong 2 жил өмнө
parent
commit
db7a738c5e

+ 4 - 6
AdminController/UnicomManageController.py

@@ -13,7 +13,7 @@ from Model.models import UnicomDeviceInfo, UnicomCombo, Pay_Type, UnicomComboOrd
 from Object.ResponseObject import ResponseObject
 
 
-class UnicomComboView(View):
+class UnicomManageControllerView(View):
 
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -114,12 +114,10 @@ class UnicomComboView(View):
                     'cardType': unicom_device.card_type,
                     'mainCard': unicom_device.main_card,
                     'createdTime': unicom_device.created_time,
-                    'NickName': '',
-                    'phone': ''
                 }
                 device_user_qs = Device_User.objects.filter(userID=unicom_device.user_id).values('NickName', 'phone')
-                data['NickName'] = device_user_qs[0]['NickName']
-                data['phone'] = device_user_qs[0]['phone']
+                data['NickName'] = device_user_qs[0]['NickName'] if device_user_qs.first() else ''
+                data['phone'] = device_user_qs[0]['phone'] if device_user_qs.first() else ''
                 list_data.append(data)
             return response.json(0, {'list': list_data, 'total': total})
         except Exception as e:
@@ -208,8 +206,8 @@ class UnicomComboView(View):
                     return response.json(0, [])
             if not combo_order_info_qs.exists():
                 return response.json(0, [])
-            combo_order_info_qs = combo_order_info_qs.order_by('-created_time')[(page - 1) * line:page * line]
             total = combo_order_info_qs.count()
+            combo_order_info_qs = combo_order_info_qs.order_by('-created_time')[(page - 1) * line:page * line]
             data_list = []
             for combo_order in combo_order_info_qs:
                 data = {'userName': '',

+ 1 - 1
Ansjer/server_urls/unicom_url.py

@@ -15,5 +15,5 @@ urlpatterns = [
     re_path(r'^api/(?P<operation>.*)$', UnicomComboController.UnicomComboView.as_view()),
     re_path(r'^wap/pay/(?P<operation>.*)$', UnicomComboPayNotifyController.UnicomComboPayNotifyView.as_view()),
     re_path(r'^combo/cron/(?P<operation>.*)$', UnicomComboTaskController.UnicomComboTaskView.as_view()),
-    re_path(r'^manage/(?P<operation>.*)$',UnicomManageController.UnicomComboView.as_view()),
+    re_path(r'^manage/(?P<operation>.*)$',UnicomManageController.UnicomManageControllerView.as_view()),
 ]