|
|
@@ -654,7 +654,7 @@ class serveManagement(View):
|
|
|
|
|
|
order_ql = omqs.values("orderID", "UID", "userID__username", "userID__NickName", "channel", "desc", "price",
|
|
|
"refunded_amount", "currency", "addTime", "updTime", "paypal", "payType",
|
|
|
- "rank__day", "rank__price", "status", "order_type")
|
|
|
+ "rank__day", "rank__price", "status", "order_type", "paymentID", "trade_no")
|
|
|
order_ql = order_ql.order_by('-addTime') # 根据CDK创建时间降序排序
|
|
|
order_ql = order_ql[(page - 1) * line:page * line]
|
|
|
for order in order_ql:
|
|
|
@@ -678,13 +678,16 @@ class serveManagement(View):
|
|
|
'order_type': order['order_type'],
|
|
|
}
|
|
|
# 添加设备套餐使用状态
|
|
|
- uid = order['UID']
|
|
|
- uid_bucket = UID_Bucket.objects.filter(uid=uid).values('use_status')
|
|
|
+ uid_bucket = UID_Bucket.objects.filter(uid=order['UID']).values('use_status')
|
|
|
user_status = uid_bucket[0]['use_status'] if uid_bucket.exists() else ''
|
|
|
+ # 判断订单是否已过期
|
|
|
if user_status != '':
|
|
|
data['user_status'] = user_status
|
|
|
else:
|
|
|
data['user_status'] = 2
|
|
|
+ # 添加PayPal交易号字段
|
|
|
+ if data['payType'] == 1:
|
|
|
+ data['trade_no'] = order['trade_no']
|
|
|
order_list.append(data)
|
|
|
return response.json(
|
|
|
0, {'list': order_list, 'total': count})
|
