|
@@ -556,7 +556,7 @@ class CloudStorageView(View):
|
|
|
print('channel:')
|
|
|
print(channel)
|
|
|
now_time = int(time.time())
|
|
|
- ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, endTime__gte=now_time). \
|
|
|
+ ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, is_use=1, endTime__gte=now_time). \
|
|
|
values("bucket__mold", "bucket__bucket", "bucket__endpoint",
|
|
|
"bucket__region", "status", "bucket__storeDay", "bucket__id")
|
|
|
if ubqs.exists():
|
|
@@ -649,7 +649,7 @@ class CloudStorageView(View):
|
|
|
dvqs = Device_Info.objects.filter(UID=uid, userID_id=userID, isShare=False)
|
|
|
if not dvqs.exists():
|
|
|
return response.json(12)
|
|
|
- ubqs = UID_Bucket.objects.filter(channel=channel, uid=uid)
|
|
|
+ ubqs = UID_Bucket.objects.filter(channel=channel, uid=uid, is_use=1)
|
|
|
if not ubqs.exists():
|
|
|
return response.json(10, '未购买')
|
|
|
now_time = int(time.time())
|
|
@@ -1270,11 +1270,7 @@ class CloudStorageView(View):
|
|
|
return response.json(0,'切换云存套餐成功')
|
|
|
return response.json(404,'切换的套餐ID不能为空')
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+#删除过期云存播放列表
|
|
|
def deleteVodHls(request):
|
|
|
# UID = 'DSXG7481JVA2JM94111A'
|
|
|
# channel = 1
|
|
@@ -1302,3 +1298,8 @@ def deleteVodHls(request):
|
|
|
print(id_list)
|
|
|
VodHlsModel.objects.filter(id__in=list(id_list)).delete()
|
|
|
return response.json(0)
|
|
|
+
|
|
|
+#删除过期云存关联套餐
|
|
|
+def deleteExpiredUidBucket(request):
|
|
|
+ now_time = int(time.time())
|
|
|
+ expired_uid_bucket = UID_Bucket.objects.filter(is_use=1, endTime__lte =now_time)
|