Browse Source

激活码新增 是否已下载字段

chenshibin 3 years ago
parent
commit
d9d5073f6c
3 changed files with 10 additions and 5 deletions
  1. 5 3
      AdminController/ServeManagementController.py
  2. 4 2
      Controller/CDKController.py
  3. 1 0
      Model/models.py

+ 5 - 3
AdminController/ServeManagementController.py

@@ -536,7 +536,7 @@ class serveManagement(View):
         order = request_dict.get('order', None)
         order = request_dict.get('order', None)
         cdk_list = []
         cdk_list = []
         sm_qs = Store_Meal.objects.filter(
         sm_qs = Store_Meal.objects.filter(
-            pay_type__payment='cdk_pay', bucket__mold=mold)
+            pay_type__payment='cdk_pay', bucket__mold=mold, is_show=0)
         if sm_qs.exists:
         if sm_qs.exists:
             rank = sm_qs[0].id
             rank = sm_qs[0].id
             for i in range(int(cdk_num)):
             for i in range(int(cdk_num)):
@@ -548,6 +548,7 @@ class serveManagement(View):
                     create_time=nowTime,
                     create_time=nowTime,
                     valid_time=0,
                     valid_time=0,
                     is_activate=0,
                     is_activate=0,
+                    is_down=0,
                     rank_id=rank,
                     rank_id=rank,
                     order=order,
                     order=order,
                 )
                 )
@@ -577,16 +578,17 @@ class serveManagement(View):
             # 下载国内未使用激活码
             # 下载国内未使用激活码
             content += '激活码(国内)\n'
             content += '激活码(国内)\n'
             cdk_inactivate_qs = CDKcontextModel.objects.filter(
             cdk_inactivate_qs = CDKcontextModel.objects.filter(
-                is_activate=0, rank__bucket__mold=0).values('cdk')
+                is_activate=0, rank__bucket__mold=0, rank__is_show=0).values('cdk')
         else:
         else:
             # 下载国外未使用激活码
             # 下载国外未使用激活码
             content += '激活码(国外)\n'
             content += '激活码(国外)\n'
             cdk_inactivate_qs = CDKcontextModel.objects.filter(
             cdk_inactivate_qs = CDKcontextModel.objects.filter(
-                is_activate=0, rank__bucket__mold=1).values('cdk')
+                is_activate=0, rank__bucket__mold=1, rank__is_show=0).values('cdk')
         for cdk_inactivate in cdk_inactivate_qs:
         for cdk_inactivate in cdk_inactivate_qs:
             content += cdk_inactivate['cdk'] + '\n'
             content += cdk_inactivate['cdk'] + '\n'
         # print(content)
         # print(content)
 
 
+        cdk_inactivate_qs.update(is_down=1)
         response = StreamingHttpResponse(content)
         response = StreamingHttpResponse(content)
         response['Content-Type'] = 'application/octet-stream'
         response['Content-Type'] = 'application/octet-stream'
         response['Content-Disposition'] = 'attachment;filename="CDK.txt"'
         response['Content-Disposition'] = 'attachment;filename="CDK.txt"'

+ 4 - 2
Controller/CDKController.py

@@ -97,6 +97,7 @@ class CDKView(View):
                 create_time=nowTime,
                 create_time=nowTime,
                 valid_time=0,
                 valid_time=0,
                 is_activate=0,
                 is_activate=0,
+                is_down=0,
                 rank_id=rank,
                 rank_id=rank,
                 order=order,
                 order=order,
             )
             )
@@ -241,15 +242,16 @@ class CDKView(View):
         if region == 'cn':
         if region == 'cn':
             # 下载国内未使用激活码
             # 下载国内未使用激活码
             content += '激活码(国内)\n'
             content += '激活码(国内)\n'
-            cdk_inactivate_qs = CDKcontextModel.objects.filter(is_activate=0, rank__bucket__mold=0).values('cdk')
+            cdk_inactivate_qs = CDKcontextModel.objects.filter(is_activate=0, rank__bucket__mold=0, rank__is_show=0).values('cdk')
         else:
         else:
             # 下载国外未使用激活码
             # 下载国外未使用激活码
             content += '激活码(国外)\n'
             content += '激活码(国外)\n'
-            cdk_inactivate_qs = CDKcontextModel.objects.filter(is_activate=0, rank__bucket__mold=1).values('cdk')
+            cdk_inactivate_qs = CDKcontextModel.objects.filter(is_activate=0, rank__bucket__mold=1, rank__is_show=0).values('cdk')
         for cdk_inactivate in cdk_inactivate_qs:
         for cdk_inactivate in cdk_inactivate_qs:
             content += cdk_inactivate['cdk'] + '\n'
             content += cdk_inactivate['cdk'] + '\n'
         # print(content)
         # print(content)
 
 
+        cdk_inactivate_qs.update(is_down=1)
         response = StreamingHttpResponse(content)
         response = StreamingHttpResponse(content)
         response['Content-Type'] = 'application/octet-stream'
         response['Content-Type'] = 'application/octet-stream'
         response['Content-Disposition'] = 'attachment;filename="CDK.txt"'
         response['Content-Disposition'] = 'attachment;filename="CDK.txt"'

+ 1 - 0
Model/models.py

@@ -1216,6 +1216,7 @@ class CDKcontextModel(models.Model):
     create_time = models.IntegerField(default=0, verbose_name='创建时间')
     create_time = models.IntegerField(default=0, verbose_name='创建时间')
     valid_time = models.IntegerField(default=0, verbose_name='有效期间')  #超过有效期激活码不可在激活 ,0:永久
     valid_time = models.IntegerField(default=0, verbose_name='有效期间')  #超过有效期激活码不可在激活 ,0:永久
     is_activate = models.SmallIntegerField(default=0, verbose_name='是否已激活') #0 未激活  1 已激活
     is_activate = models.SmallIntegerField(default=0, verbose_name='是否已激活') #0 未激活  1 已激活
+    is_down = models.SmallIntegerField(default=0, verbose_name='是否已下载') #0 未下载 1 已下载
     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
     # order = models.ForeignKey(Order_Model, blank=True, max_length=20, to_field='orderID', on_delete=models.CASCADE, verbose_name='订单id', unique=True)
     # order = models.ForeignKey(Order_Model, blank=True, max_length=20, to_field='orderID', on_delete=models.CASCADE, verbose_name='订单id', unique=True)
     order = models.CharField(max_length=20, blank=True, unique=True, verbose_name='订单id')
     order = models.CharField(max_length=20, blank=True, unique=True, verbose_name='订单id')