修改查询未使用序列号逻辑

Controller/SerialNumberController.py

@@ -485,30 +485,23 @@ class SerialNumberView(View):
             return response.json(5)
         redis_obj.CONN.expire(serial_operate_lock_key, 60)
 
-        # 查询可用的序列号
-        company_serial_qs = CompanySerialModel.objects.filter(company__secret=company_secret, status=1).first()
-        if company_serial_qs is None:
+        # 查询13800138005账号(user_id: 6)下未使用的序列号
+        user_serial_number_qs = UserSerialNumberModel.objects.filter(user__id=6, serial_number__use_status=1).first()
+        if user_serial_number_qs is None:
             redis_obj.del_data(key=serial_operate_lock_key)  # redis解锁
             return response.json(14)
 
-        serial_number = company_serial_qs.serial_number
-        company_mark = company_serial_qs.company.mark
+        serial_number = user_serial_number_qs.serial_number.serial_number
 
-        # 查询序列号管理员账号
-        user_qs = UserModel.objects.filter(permission=2).values('id')
-        if not user_qs.exists():
-            redis_obj.del_data(key=serial_operate_lock_key)  # redis解锁
-            return response.json(9)
-        user_id = user_qs[0]['id']
-
-        # 查询是否还有未使用的序列号
-        user_serial_number_qs = UserSerialNumberModel.objects.filter(user__id=user_id,
-                                                                     serial_number__serial_number=serial_number,
-                                                                     serial_number__use_status=1)
-        if not user_serial_number_qs.exists():
+        # 查询序列号企业数据
+        company_serial_qs = CompanySerialModel.objects.filter(company__secret=company_secret,
+                                                              serial_number=serial_number, status=1).first()
+        if company_serial_qs is None:
             redis_obj.del_data(key=serial_operate_lock_key)  # redis解锁
             return response.json(14)
 
+        company_mark = company_serial_qs.company.mark
+
         # 防止重复获取序列号
         serial_number_lock = redis_obj.CONN.setnx(serial_number + 'serial_number_lock', 1)
         redis_obj.CONN.expire(serial_number + 'serial_number_lock', 60)