后台订单查询新增交易号以及序列号搜索

AdminController/ServeManagementController.py

@@ -682,6 +682,7 @@ class serveManagement(View):
         timeRange = request_dict.getlist('timeRange[]', None)
         orderType = request_dict.get('orderType', None)
         serialNumber = request_dict.get('serialNumber', None)
+        trade_no = request_dict.get('tradeNo', None)
 
         if not all([pageNo, pageSize]):
             return response.json(444)
@@ -707,10 +708,11 @@ class serveManagement(View):
                 omqs = omqs.filter(status=status)
             if orderType:
                 omqs = omqs.filter(order_type=int(orderType))
+            if trade_no:
+                omqs = omqs.filter(trade_no=trade_no)
             if serialNumber:
-                device_info_qs = Device_Info.objects.filter(serial_number=serialNumber).values('UID')
-                uid = device_info_qs[0]['UID'] if device_info_qs.exists() else 'N/A'
-                omqs = omqs.filter(UID=uid)
+                device_uid = CommonService.query_uid_with_serial(serialNumber)
+                omqs = omqs.filter(UID=device_uid)
             if timeRange:
                 startTime, endTime = int(
                     timeRange[0][:-3]), int(timeRange[1][:-3])