定制客户模块 修改定制客户设备扫码添加接口

Controller/CustomCustomer/CustomCustomerController.py

@@ -134,17 +134,11 @@ class CustomCustomerView(View):
         """
         # 获取并验证请求中的必要参数
         c_id = request_dict.get('cId')
-        full_code = request_dict.get('fullCode', '').strip()
+        full_code = request_dict.get('QRcode', '').strip()
 
         if not c_id or not full_code:
-            return response.json(444, "cId、fullCode是必要参数")
+            return response.json(444, "cId、QRcode")
 
-        # 检查full_code的格式并提取相关字段
-        uid, serial_number = self.process_full_code(full_code)
-        if not uid:
-            return response.json(444, 'fullCode格式错误')
-
-        device_type = UidSetModel.objects.filter(uid=uid)[0].device_type
         # 验证客户信息是否存在
         custom_customer = CustomCustomerOrderInfo.objects.filter(id=c_id).first()
         if not custom_customer:
@@ -152,6 +146,9 @@ class CustomCustomerView(View):
 
         # 创建新设备记录
         try:
+            # 检查full_code的格式并提取相关字段
+            uid, serial_number, device_type = self.process_full_code(full_code)
+
             CustomCustomerDevice.objects.create(
                 c_id=c_id,
                 serial_number=serial_number,
@@ -170,14 +167,13 @@ class CustomCustomerView(View):
         """ 处理full_code, 返回uid和serial_number """
         serial_number = ""
         uid = ""
+        device_type = 0
         if len(full_code) == 14:
             serial_number = full_code[:9]
-            device_uid = CommonService.query_uid_with_serial(serial_number)
-            if len(device_uid) == 20:
-                uid = device_uid
+            device_type = full_code[-4:].int(16)
         elif len(full_code) == 20:
             uid = full_code
-        return uid, serial_number
+        return uid, serial_number, device_type
 
     @staticmethod
     def get_customer_device_count(request_dict, response):