序列号去除p2p类型

Controller/CompanyController.py

@@ -130,7 +130,6 @@ class CompanyView(View):
         #     return response.json(309)
 
         id = request_dict.get('id', None)
-        p2p = request_dict.get('p2p', None)
         quantity = request_dict.get('quantity', None)
 
         if not all([id, quantity]):
@@ -140,23 +139,22 @@ class CompanyView(View):
         if not company_qs.exists():
             return response.json(444)
 
-        p2p_sum_Serial = SerialNumberModel.objects.filter(p2p=p2p).count()
-        p2p_sum_Serial_company = CompanySerialModel.objects.filter(p2p=p2p).count()
-        p2p_sum_bind = p2p_sum_Serial - p2p_sum_Serial_company  # 剩余可绑定的序列号
-        if int(quantity) > int(p2p_sum_bind):
+        sum_Serial = SerialNumberModel.objects.filter().count()
+        sum_Serial_company = CompanySerialModel.objects.filter().count()
+        sum_bind = sum_Serial - sum_Serial_company  # 剩余可绑定的序列号
+        if int(quantity) > int(sum_bind):
             return response.json(10041)
 
         try:
             company = company_qs[0]
-            start_1 = p2p_sum_Serial_company
+            start_1 = sum_Serial_company
             end_1 = int(start_1) + int(quantity)
-            serial_qs = SerialNumberModel.objects.filter(p2p=p2p)[start_1:end_1]
+            serial_qs = SerialNumberModel.objects.filter()[start_1:end_1]
             if serial_qs.exists():
                 company_serial_bulk = []
                 now_time = int(time.time())
                 for item in serial_qs:
                     company_serial_bulk.append(CompanySerialModel(
-                        p2p=p2p,
                         status=1,
                         add_time=now_time,
                         update_time=now_time,

Controller/SerialNumberController.py

@@ -63,7 +63,6 @@ class SerialNumberView(View):
 
     def do_create(self, request_dict, response):
         quantity = int(request_dict.get('quantity', 0))
-        p2p = int(request_dict.get('p2p', 0))
 
         if not quantity:
             return response.json(444)
@@ -81,7 +80,7 @@ class SerialNumberView(View):
                 sum += 1  # sum每次递增1
                 # 前面补0至六位
                 serial_number = (6 - len(serial_number)) * '0' + serial_number
-                serial_number_bulk.append(SerialNumberModel(serial_number=serial_number, add_time=now_time, p2p=p2p))
+                serial_number_bulk.append(SerialNumberModel(serial_number=serial_number, add_time=now_time))
             # 开启事务写入
             with transaction.atomic():
                 SerialNumberModel.objects.bulk_create(serial_number_bulk)
@@ -148,7 +147,10 @@ class SerialNumberView(View):
             return response.json(404)
 
         serial = serial_number[0:6]
-
+        full_serial = serial_number[0:9]
+        p2p = 1
+        if serial_number[9:10]:
+            p2p = serial_number[9:10]
         try:
             if not country_id:
                 ip = CommonService.get_ip_address(request)
@@ -167,8 +169,6 @@ class SerialNumberView(View):
             elif company_serial.status == 1:    # 绑定uid
                 with transaction.atomic():
                     count = 0
-                    # 获取序列号的p2p类型
-                    p2p = SerialNumberModel.objects.filter(serial_number=serial).values('p2p')[0]['p2p']
                     while count < 3:
                         # 查询是否存在未绑定序列号的uid
                         uid_qs = UIDModel.objects.filter(vpg__company_id=company_serial.company.id,
@@ -223,7 +223,7 @@ class SerialNumberView(View):
 
                         dev = Device_Info.objects.filter(UID=uid.uid)
                         if dev.exists():
-                            dev.update(serial_number=serial_number)
+                            dev.update(serial_number=full_serial)
 
                         full_uid_code = uid.full_uid_code
                         if uid.platform in CRCKey.keys():
@@ -390,12 +390,11 @@ class SerialNumberView(View):
 
         id = request_dict.get('id', None)
         status = request_dict.get('status', None)
-        p2p = request_dict.get('p2p', None)
 
         if id and status:
             serial_number_qs = SerialNumberModel.objects.filter(id=id)
             if serial_number_qs.exists():
-                serial_number_qs.update(**{'status': status, 'p2p': p2p})
+                serial_number_qs.update(**{'status': status})
                 return response.json(0)
             else:
                 return response.json(173)

Model/models.py

@@ -1506,7 +1506,6 @@ class SerialNumberModel(models.Model):
     serial_number = models.CharField(max_length=9, db_index=True, unique=True, verbose_name='序列号')
     status = models.SmallIntegerField(default=1, verbose_name='可用状态。0：不可用，1：可用')
     use_status = models.SmallIntegerField(default=0, db_index=True, verbose_name='使用状态, 0: 未使用, 1: 已分配')
-    p2p = models.SmallIntegerField(default=0, db_index=True, verbose_name='p2p类型。0：无，1：宸云，2：tutk')
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
 
     class Meta:
@@ -1520,7 +1519,6 @@ class CompanySerialModel(models.Model):
     company = models.ForeignKey(CompanyModel, to_field='id', on_delete=models.CASCADE, verbose_name='关联企业表的id')
     serial_number = models.CharField(max_length=11, db_index=True, blank=True, default='', verbose_name=u'6位数序列号')
     status = models.SmallIntegerField(default=0, verbose_name='序列号的状态。0：未使用，1：已使用，2：已和UID关联')
-    p2p = models.SmallIntegerField(default=0, verbose_name='p2p类型。0：无，1：宸云，2：tutk')
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
     update_time = models.IntegerField(default=0, verbose_name='更新时间')