|
@@ -732,6 +732,7 @@ class serveManagement(View):
|
|
|
order_ql = order_ql.order_by('-addTime') # 根据CDK创建时间降序排序
|
|
order_ql = order_ql.order_by('-addTime') # 根据CDK创建时间降序排序
|
|
|
order_ql = order_ql[(page - 1) * line:page * line]
|
|
order_ql = order_ql[(page - 1) * line:page * line]
|
|
|
for order in order_ql:
|
|
for order in order_ql:
|
|
|
|
|
+ serialNumber = CommonService.query_serial_with_uid(order['UID'])
|
|
|
data = {
|
|
data = {
|
|
|
'orderID': order['orderID'],
|
|
'orderID': order['orderID'],
|
|
|
'UID': order['UID'],
|
|
'UID': order['UID'],
|
|
@@ -751,7 +752,7 @@ class serveManagement(View):
|
|
|
'status': order['status'],
|
|
'status': order['status'],
|
|
|
'order_type': order['order_type'],
|
|
'order_type': order['order_type'],
|
|
|
'payTime': order['payTime'] if order['payTime'] else 'N/A',
|
|
'payTime': order['payTime'] if order['payTime'] else 'N/A',
|
|
|
- 'serialNumber': CommonService.query_serial_with_uid(order['UID'])
|
|
|
|
|
|
|
+ 'serialNumber': 'N/A' if serialNumber == order['UID'] else serialNumber
|
|
|
}
|
|
}
|
|
|
# 订单显示(或不显示)停用/退款功能
|
|
# 订单显示(或不显示)停用/退款功能
|
|
|
if order['order_type'] == 0 or order['order_type'] == 1: # 云存
|
|
if order['order_type'] == 0 or order['order_type'] == 1: # 云存
|
|
@@ -775,12 +776,6 @@ class serveManagement(View):
|
|
|
data['user_status'] = 1
|
|
data['user_status'] = 1
|
|
|
else:
|
|
else:
|
|
|
data['user_status'] = 2
|
|
data['user_status'] = 2
|
|
|
- # 添加序列号
|
|
|
|
|
- data['serial_number'] = 'N/A'
|
|
|
|
|
- device_info_qs = Device_Info.objects.filter(UID=order['UID']).values('serial_number')
|
|
|
|
|
- if device_info_qs.exists():
|
|
|
|
|
- data['serial_number'] = device_info_qs[0]['serial_number'] if device_info_qs[0][
|
|
|
|
|
- 'serial_number'] else 'N/A'
|
|
|
|
|
# 添加PayPal交易号字段
|
|
# 添加PayPal交易号字段
|
|
|
data['trade_no'] = 'N/A'
|
|
data['trade_no'] = 'N/A'
|
|
|
if data['payType'] == 1:
|
|
if data['payType'] == 1:
|
