新增PC获取序列号接口2

Controller/SerialNumberController.py

@@ -179,12 +179,12 @@ class SerialNumberView(View):
 
     # 提供给pc端获取序列号
     def do_get_serial_number(self, request_dict, response):
-        quantity = request_dict.get('quantity', None)
+        quantity = 1   #只能取一个
         company_id = request_dict.get('company_id', None)
         token = request_dict.get('token', None)
         time_stamp = request_dict.get('time_stamp', None)
         p2p_type = request_dict.get('p2p_type', None)
-
+        mac = request_dict.get('mac', None)
         if token and time_stamp and quantity and company_id:
 
             token = int(CommonService.decode_data(token))
@@ -208,9 +208,6 @@ class SerialNumberView(View):
             if count == 5 and value is False:  # 暂时注释
                 return response.json(5)
 
-            quantity = 1   #只能取一个
-
-
             company_serial_qs = CompanySerialModel.objects.filter(company__secret=company_id, status=0,
                                                                   p2p=p2p_type)
             if not company_serial_qs.exists():
@@ -223,17 +220,16 @@ class SerialNumberView(View):
             # company_serial_qs = company_serial_qs.values('id', 'serial_number__serial_number', 'company__mark')
             save_point = transaction.savepoint()  # 设置事务保存点
             try:
-                data = []
                 ids = []
                 for serial in company_serial_qs:
                     ids.append(serial.id)
-                    data.append(serial.serial_number + serial.company.mark)
                     SerialNumberModel.objects.filter(serial_number=serial.serial_number).update(use_status=2)
                 CompanySerialModel.objects.filter(id__in=ids).update(status=1)
             except Exception as e:
                 if save_point:
                     transaction.savepoint_rollback(save_point)  # 事务回滚
             redisObject.rpush(key, value)
-            return response.json(0, data)
+
+            return response.json(0, {'serial_number': company_serial_qs[0].serial_number + company_serial_qs[0].company.mark, 'mac': mac})
         else:
             return response.json(444)