新增is_CloudDrive字段

Controller/IcloudService/IcloudMeal.py

@@ -541,12 +541,13 @@ class IcloudMeal(View):
         @param response: 响应
         @return: response
         """
+        nowTime = int(time.time())
         try:
             cloud_use_qs = IcloudUseDetails.objects.filter(user_id=user_id).values('id').aggregate(
                 total_used_size=Sum('use_size'),
                 id=Sum('id'))
-            id = cloud_use_qs['id']
-            cloud_service_qs = IcloudService.objects.filter(use_details_id=id).aggregate(
+            cloud_service_qs = IcloudService.objects.filter(Q(use_details_id=cloud_use_qs['id']), Q(use_status=0),
+                                                            Q(end_time__gt=nowTime) | Q(end_time=0)).aggregate(
                 total_size=Sum('size'))
 
             data = {

Model/models.py

@@ -173,6 +173,7 @@ class Device_User(AbstractBaseUser):
     language = models.CharField(blank=True, max_length=16, default='en', verbose_name=u'语言地区')
     # 手机注册增加字段
     phone = models.CharField(max_length=16, db_index=True, verbose_name=u'手机号', default='', blank=True)
+    is_cloudDrive = models.IntegerField(blank=True, default=0, verbose_name=u'用户是否开通云盘')  # 0：未开通， 1：已开通
     fingerprint_enable = models.SmallIntegerField(default=0, verbose_name=u'是否开启了指纹登录')  # 0：未开启，1：已开启
     fingerprint_key = models.CharField(max_length=128, default='', verbose_name=u'客户端用于解码的密钥等信息')
     is_local = models.BooleanField(blank=True, default=False, verbose_name=u'是否是本地登录用户')  # False：账号登录，1：本地登录