|
@@ -35,10 +35,15 @@ def queryUserEquipmentInterface(request):
|
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
res = []
|
|
res = []
|
|
|
|
|
+ nowTime = CommonService.get_utc()
|
|
|
for p in dvdict['datas']:
|
|
for p in dvdict['datas']:
|
|
|
p['fields']['vod'] = []
|
|
p['fields']['vod'] = []
|
|
|
for dm in ubqs:
|
|
for dm in ubqs:
|
|
|
if p['fields']['UID'] == dm['uid']:
|
|
if p['fields']['UID'] == dm['uid']:
|
|
|
|
|
+ if dm['endTime']>nowTime:
|
|
|
|
|
+ dm['valid'] = 1
|
|
|
|
|
+ else:
|
|
|
|
|
+ dm['valid'] = 0
|
|
|
p['fields']['vod'].append(dm)
|
|
p['fields']['vod'].append(dm)
|
|
|
# p['fields']['primaryUserID'] = ''
|
|
# p['fields']['primaryUserID'] = ''
|
|
|
res.append(p)
|
|
res.append(p)
|
chenjunkai