|
|
@@ -88,20 +88,29 @@ class OrderView(View):
|
|
|
data = []
|
|
|
nowTime = CommonService.get_utc()
|
|
|
# 这里需要进行优化
|
|
|
+ # for d in order_list:
|
|
|
+ # # 未付款的一个小时后过期
|
|
|
+ # if d['status'] == 0:
|
|
|
+ # if d['addTime'] + 3600 < nowTime:
|
|
|
+ # d['status'] = 3
|
|
|
+ # if did:
|
|
|
+ # d['did'] = did
|
|
|
+ # else:
|
|
|
+ # didqs = Device_Info.objects.filter(userID_id=userID, UID=d['UID']).values('id')
|
|
|
+ # if didqs.exists():
|
|
|
+ # did = didqs[0]['id']
|
|
|
+ # else:
|
|
|
+ # did = ''
|
|
|
+ # d['did'] = did
|
|
|
+ # data.append(d)
|
|
|
+ #################
|
|
|
+ uid_list = []
|
|
|
+ for od in order_list:
|
|
|
+ uid_list.append(od['UID'])
|
|
|
+ didqs = Device_Info.objects.filter(userID_id=userID, UID__in=uid_list).values('id','UID')
|
|
|
for d in order_list:
|
|
|
- # 未付款的一个小时后过期
|
|
|
- if d['status'] == 0:
|
|
|
- if d['addTime'] + 3600 < nowTime:
|
|
|
- d['status'] = 3
|
|
|
- if did:
|
|
|
- d['did'] = did
|
|
|
- else:
|
|
|
- didqs = Device_Info.objects.filter(userID_id=userID, UID=d['UID']).values('id')
|
|
|
- if didqs.exists():
|
|
|
- did = didqs[0]['id']
|
|
|
- else:
|
|
|
- did = ''
|
|
|
- d['did'] = did
|
|
|
- # d['endTime'] = int(d['updTime'])+int(d['rank__day']*86400)
|
|
|
- data.append(d)
|
|
|
+ for did in didqs:
|
|
|
+ if d['UID'] == did['UID']:
|
|
|
+ d['did'] = d['id']
|
|
|
+ data.append(d)
|
|
|
return response.json(0, {'data': data, 'count': count})
|
chenjunkai