查询结算明细新增公司名

AdminController/CloudServiceManage/AgentCustomerController.py

@@ -528,16 +528,15 @@ class AgentCustomerView(View):
         startTime = int(request_dict.get('start_time', 1))
         endTime = int(request_dict.get('end_time', 0))
 
-
         page = int(request_dict.get('page', 1))  # 默认为第一页
         page_size = int(request_dict.get('page_size', 10))  # 默认每页10条记录
         try:
             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)
+                agent_device_orders_qs = AgentDeviceOrder.objects.filter(is_del=False)
             else:
                 ac_id = agent_customer_info.id
-                agent_device_orders_qs = AgentDeviceOrder.objects.filter(ac_id=ac_id, is_del=0)
+                agent_device_orders_qs = AgentDeviceOrder.objects.filter(ac_id=ac_id, is_del=False)
 
             if time_str:
                 year, quarter = map(int, time_str.split('-'))
@@ -558,7 +557,8 @@ class AgentCustomerView(View):
                 agent_device_orders_qs = agent_device_orders_qs.filter(created_time__gte=startTime,
                                                                        created_time__lte=endTime)
             if package_type:
-                csp_ids = list(AgentCloudServicePackage.objects.filter(type=int(package_type)).values_list('id', flat=True))
+                csp_ids = list(
+                    AgentCloudServicePackage.objects.filter(type=int(package_type)).values_list('id', flat=True))
                 agent_device_orders_qs = agent_device_orders_qs.filter(csp_id__in=csp_ids)
 
             # 计算利润总额和订单总数
@@ -573,9 +573,11 @@ class AgentCustomerView(View):
             for order in current_page:
                 csp = AgentCloudServicePackage.objects.filter(id=order.csp_id).first()
                 service_name = csp.service_name if csp else order.csp_id
-
+                agent_customer_info = AgentCustomerInfo.objects.filter(id=order.ac_id).first()
+                company_name = agent_customer_info.company_name if agent_customer_info else order.ac_id
                 orders.append({
                     'id': order.id,
+                    'company_name': company_name,
                     'serial_number': order.serial_number,
                     'status': order.status,
                     'service_name': service_name,
@@ -583,7 +585,7 @@ class AgentCustomerView(View):
                     'profit': order.profit,
                     'settlement_time': order.settlement_time,
                     'remark': order.remark,
-                    'created_time':order.created_time
+                    'created_time': order.created_time
                 })
 
             response_data = {