|
|
@@ -110,7 +110,7 @@ class CloudVodView(View):
|
|
|
elif operation == 'filterVod':
|
|
|
return self.do_filter_playlist(request_dict, userID, response)
|
|
|
elif operation == 'findVod':
|
|
|
- return self.do_find_playlist(request_dict,userID,response)
|
|
|
+ return self.do_find_playlist(request_dict, userID, response)
|
|
|
else:
|
|
|
return response.json(414)
|
|
|
|
|
|
@@ -217,7 +217,7 @@ class CloudVodView(View):
|
|
|
# 续费流程
|
|
|
nowTime = int(time.time())
|
|
|
# 判断是否存在未完成订单
|
|
|
- hasOrder = Order_Model.objects.filter(UID=uid, channel=channel, addTime__gte=nowTime-3600, status=0,
|
|
|
+ hasOrder = Order_Model.objects.filter(UID=uid, channel=channel, addTime__gte=nowTime - 3600, status=0,
|
|
|
rank_id=rank). \
|
|
|
values('paypal')
|
|
|
if hasOrder.exists():
|
|
|
@@ -556,7 +556,7 @@ class CloudVodView(View):
|
|
|
nowTime = int(time.time())
|
|
|
vodqs = VodHlsModel.objects.filter(uid=UID, channel=channel, time__range=(startTime, endTime),
|
|
|
endTime__gte=nowTime) \
|
|
|
- .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
|
|
|
+ .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region","id")
|
|
|
vod_play_list = []
|
|
|
print(vodqs)
|
|
|
for vod in vodqs:
|
|
|
@@ -576,5 +576,6 @@ class CloudVodView(View):
|
|
|
format(url_start=url_start, url_end=url_end)
|
|
|
thumb = bucket.sign_url('GET', ts, 3600,
|
|
|
params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_300'})
|
|
|
- vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec'],'id':vod['id']})
|
|
|
+ vod_play_list.append(
|
|
|
+ {'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec'], 'id': vod['id']})
|
|
|
return response.json(0, vod_play_list)
|
chenjunkai