tt

Model/models.py

@@ -393,7 +393,7 @@ class VodBucketModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
     bucket = models.CharField(max_length=30, verbose_name='设备UID')
     storeDay = models.IntegerField(default=0, verbose_name='存储生命周期(天)')
-    content = models.TextField(verbose_name='描述',default='')
+    content = models.TextField(verbose_name='描述', default='')
     endpoint = models.CharField(max_length=125, default='', verbose_name='存储节点')
     area = models.CharField(max_length=16, default='', verbose_name='区域')
     region = models.CharField(max_length=16, default='', verbose_name='regionID')
@@ -401,8 +401,7 @@ class VodBucketModel(models.Model):
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 
-    mold = models.SmallIntegerField(default=0,verbose_name='存储区域类型')  # 0：国内阿里 1：国外aws
-
+    mold = models.SmallIntegerField(default=0, verbose_name='存储区域类型')  # 0：国内阿里 1：国外aws
 
     def __str__(self):
         return self.id
@@ -427,6 +426,7 @@ class Store_Meal(models.Model):
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE,
                                default=1, verbose_name='存储空间')
     vod_type = models.SmallIntegerField(default=0, verbose_name='云存储套餐类型')  # 0：事件型 1：连续型
+    commodity_code = models.CharField(default='', max_length=16, verbose_name='套餐规格码', unique=True)
 
     def __str__(self):
         return self.id
@@ -526,11 +526,15 @@ class Order_Model(models.Model):
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
     endTime = models.IntegerField(verbose_name='结束时间', default=0)
+    payTime = models.IntegerField(verbose_name='支付成功时间', default=0)
     status = models.SmallIntegerField(default=0, verbose_name='付款状态')  # 0:否，1：成功
     # 订单关联套餐
     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
     paypal = models.CharField(max_length=150, default='', verbose_name='paypal付款url')
     payType = models.SmallIntegerField(default=0, verbose_name='付款类型0:paypal,1:alipay')
+    commodity_type = models.SmallIntegerField(default=0, verbose_name='云存储套餐类型')
+    nickname = models.CharField(default='', max_length=64, verbose_name='设备昵称')
+    uid_bucket_id = models.IntegerField(default=0, verbose_name='关联uid_bucket的字段')
 
     def __str__(self):
         return self.orderID
@@ -588,8 +592,6 @@ class UID_Bucket(models.Model):
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
     status = models.SmallIntegerField(default=0, verbose_name='状态[0:开启,1:关闭]')
     endTime = models.IntegerField(verbose_name='结束时间', default=0)
-    order = models.ForeignKey(Order_Model, blank=True, to_field='orderID', on_delete=models.CASCADE, verbose_name='订单编号')
-
 
     class Meta:
         db_table = 'vod_uid_bucket'
@@ -598,21 +600,6 @@ class UID_Bucket(models.Model):
         ordering = ('id',)
 
 
-# class UID_Bucket(models.Model):
-#     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-#     uid = models.CharField(max_length=20, verbose_name='设备UID')
-#     channel = models.SmallIntegerField(default=0, verbose_name='通道')
-#     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
-#     status = models.SmallIntegerField(default=0, verbose_name='状态[0:开启,1:关闭]')
-#     endTime = models.IntegerField(verbose_name='结束时间', default=0)
-#
-#     class Meta:
-#         db_table = 'vod_uid_bucket'
-#         verbose_name = u'设备关联套餐表'
-#         verbose_name_plural = verbose_name
-#         ordering = ('id',)
-
-
 class UID_Preview(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
@@ -869,4 +856,4 @@ class GrantCodeModel(models.Model):
     class Meta:
         ordering = ('-add_time',)
         verbose_name = u'授权码表'
-        db_table = 'oauth_grant_code'
+        db_table = 'oauth_grant_code'