查询套餐明细 添加套餐类型选择

AdminController/CloudServiceManage/AgentCustomerController.py

@@ -477,6 +477,7 @@ class AgentCustomerView(View):
 
         status = request_dict.get('status', None)
         time_str = request_dict.get('time', None)
+        package_type = request_dict.get('package_type', None)
         startTime = int(request_dict.get('start_time', 1))
         endTime = int(request_dict.get('end_time', 0))
 
@@ -504,6 +505,9 @@ class AgentCustomerView(View):
             if startTime < endTime:
                 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))
+                agent_device_orders_qs = agent_device_orders_qs.filter(csp_id__in=csp_ids)
 
             # 计算利润总额和订单总数
             total_profit = agent_device_orders_qs.aggregate(Sum('profit'))['profit__sum'] or 0