feature:区分paypal支付宝套餐

Controller/CloudVod.py

@@ -433,9 +433,11 @@ class CloudVodView(View):
         if not qs.exists():
             return response.json(12)
         smqs = Store_Meal.objects.filter(id=rank). \
-            values("currency", "price", "content", "day", "bucket__storeDay", "bucket__region")
+            values("currency", "price", "content", "day", "bucket__storeDay", "bucket__region","type")
         if not smqs.exists():
             return response.json(10, '套餐不存在')
+        if smqs[0]['type'] != 0:
+            return response.json(10,'套餐不支持paypal支付')
         currency = smqs[0]['currency']
         price = smqs[0]['price']
         content = smqs[0]['content']

Model/models.py

@@ -393,6 +393,7 @@ class Store_Meal(models.Model):
     day = models.IntegerField(default=0, blank=True, verbose_name=u'套餐天数')
     content = models.TextField(blank=True, null=True, verbose_name=u'描述')
     add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间', auto_now_add=True)
+    type = models.SmallIntegerField(default=0,verbose_name='付款类型') # 0 是paypla,1为支付宝
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
                                verbose_name='存储空间')
@@ -406,26 +407,6 @@ class Store_Meal(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('id',)
 
-#
-# class Device_Meal(models.Model):
-#     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-#     status = models.IntegerField(default=0, blank=True, verbose_name=u'状态')
-#     uid = models.CharField(default='', blank=True, max_length=32, verbose_name=u'设备ID')
-#     channel = models.IntegerField(default=0, blank=True, verbose_name=u'设备通道')
-#     add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间', auto_now_add=True)
-#     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
-#     end_time = models.DateTimeField(blank=True, verbose_name=u'最后时间')
-#     rank = models.ForeignKey(Store_Meal, blank=True, to_field='id',
-#                              on_delete=models.CASCADE, verbose_name='套餐类型')
-#
-#     class Meta:
-#         db_table = 'device_meal'
-#         verbose_name = u'设备关联套餐表'
-#         verbose_name_plural = verbose_name
-#         ordering = ('id',)
-#
-#     def __str__(self):
-#         return self.id
 
 
 class Equipment_Version(models.Model):