更改结算明细+设备明细后台界面

AdminController/CloudServiceManage/AgentCustomerController.py

@@ -518,11 +518,6 @@ class AgentCustomerView(View):
         @param response: 响应对象
         @return:
         """
-        agent_customer_info = AgentCustomerInfo.objects.filter(user_id=userID).first()
-        if not agent_customer_info:
-            return response.json(104, 'Agent customer not found')
-
-        ac_id = agent_customer_info.id
 
         status = request_dict.get('status', None)
         time_str = request_dict.get('time', None)
@@ -534,7 +529,12 @@ class AgentCustomerView(View):
         page = int(request_dict.get('page', 1))  # 默认为第一页
         page_size = int(request_dict.get('page_size', 10))  # 默认每页10条记录
         try:
-            agent_device_orders_qs = AgentDeviceOrder.objects.filter(ac_id=ac_id, is_del=0)
+            agent_customer_info = AgentCustomerInfo.objects.filter(user_id=userID).first()
+            if agent_customer_info is None:
+                agent_device_orders_qs = AgentDeviceOrder.objects.filter(is_del=0)
+            else:
+                ac_id = agent_customer_info.id
+                agent_device_orders_qs = AgentDeviceOrder.objects.filter(ac_id=ac_id, is_del=0)
 
             if time_str:
                 year, quarter = map(int, time_str.split('-'))

AdminController/CloudServiceManage/AgentDeviceController.py

@@ -96,14 +96,13 @@ class AgentDeviceView(View):
         page = int(request_dict.get('page', 1))  # 默认为第一页
         page_size = int(request_dict.get('page_size', 10))  # 默认每页10条记录
 
-        agent_customer_info = AgentCustomerInfo.objects.filter(user_id=userID).first()
-        if agent_customer_info is None:
-            return response.json(104, 'Agent customer not found')
-
-        ac_id = agent_customer_info.id
-
         try:
-            agent_device_qs = AgentDevice.objects.filter(ac_id=ac_id).order_by('ac_id', '-created_time')
+            agent_customer_info = AgentCustomerInfo.objects.filter(user_id=userID).first()
+            if agent_customer_info is None:
+                agent_device_qs = AgentDevice.objects.order_by('ac_id', '-created_time')
+            else:
+                ac_id = agent_customer_info.id
+                agent_device_qs = AgentDevice.objects.filter(ac_id=ac_id).order_by('ac_id', '-created_time')
 
             if device_name:
                 # 根据device_name查询对应的type值
@@ -125,9 +124,12 @@ class AgentDeviceView(View):
             for device in current_page:
                 device_type = DeviceTypeModel.objects.filter(type=device.type).first()
                 device_name = device_type.name if device_type else device.type
+                agent_customer_info = AgentCustomerInfo.objects.filter(id=device.ac_id).first()
+                company_name = agent_customer_info.company_name if agent_customer_info else device.ac_id
                 device_list.append({
                     'id': device.id,
                     'ac_id': device.ac_id,
+                    'company_name': company_name,
                     'status': device.status,
                     'serial_number': device.serial_number,
                     'device_name': device_name,