|
|
@@ -1259,17 +1259,37 @@ class DeviceManagement(View):
|
|
|
paginator = Paginator(customer_device_qs, page_size)
|
|
|
customer_device_page = paginator.get_page(page)
|
|
|
|
|
|
+ # 创建一个字典来映射 c_id 到 CustomCustomerOrderInfo 对象
|
|
|
+ customer_order_map = {order.id: order for order in custom_customer_qs}
|
|
|
+
|
|
|
# 构建设备列表
|
|
|
customer_device_list = []
|
|
|
for device in customer_device_page.object_list:
|
|
|
- customer_device_list.append({
|
|
|
- 'id': device.id,
|
|
|
- 'serialNumber': device.serial_number,
|
|
|
- 'uid': device.uid,
|
|
|
- 'deviceType': device.type,
|
|
|
- 'fullCode': device.full_code,
|
|
|
- 'addTime': device.created_time,
|
|
|
- })
|
|
|
+ customer_order = customer_order_map.get(device.c_id)
|
|
|
+ if customer_order:
|
|
|
+ customer_device_list.append({
|
|
|
+ 'id': device.id,
|
|
|
+ 'serialNumber': device.serial_number,
|
|
|
+ 'uid': device.uid,
|
|
|
+ 'deviceType': device.type,
|
|
|
+ 'fullCode': device.full_code,
|
|
|
+ 'addTime': device.created_time,
|
|
|
+ 'orderNumber': customer_order.order_number,
|
|
|
+ 'name': customer_order.name,
|
|
|
+ 'email': customer_order.email,
|
|
|
+ })
|
|
|
+ else:
|
|
|
+ customer_device_list.append({
|
|
|
+ 'id': device.id,
|
|
|
+ 'serialNumber': device.serial_number,
|
|
|
+ 'uid': device.uid,
|
|
|
+ 'deviceType': device.type,
|
|
|
+ 'fullCode': device.full_code,
|
|
|
+ 'addTime': device.created_time,
|
|
|
+ 'orderNumber': "",
|
|
|
+ 'name': "",
|
|
|
+ 'email': "",
|
|
|
+ })
|
|
|
|
|
|
# 构造返回数据
|
|
|
data = {
|
