|
|
@@ -20,7 +20,7 @@ from Controller.Cron.CronTaskController import CronUpdateDataView
|
|
|
from Controller.UnicomCombo.UnicomComboTaskController import UnicomComboTaskView
|
|
|
from Model.models import VodBucketModel, CDKcontextModel, Store_Meal, Order_Model, \
|
|
|
UID_Bucket, ExperienceContextModel, Lang, CloudLogModel, UidSetModel, Unused_Uid_Meal, \
|
|
|
- Device_Info, DeviceTypeModel, UnicomComboOrderInfo, AiService
|
|
|
+ Device_Info, DeviceTypeModel, UnicomComboOrderInfo, AiService, CountryModel
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
from Object.UnicomObject import UnicomObjeect
|
|
|
@@ -728,10 +728,15 @@ 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", "paymentID", "trade_no",
|
|
|
- "payTime")
|
|
|
+ "payTime", "region_country")
|
|
|
order_ql = order_ql.order_by('-addTime') # 根据CDK创建时间降序排序
|
|
|
order_ql = order_ql[(page - 1) * line:page * line]
|
|
|
for order in order_ql:
|
|
|
+ # 查询国家信息
|
|
|
+ country = 'N/A'
|
|
|
+ country_qs = CountryModel.objects.filter(id=order['region_country']).values('country_name')
|
|
|
+ if country_qs.exists():
|
|
|
+ country = country_qs['country_name']
|
|
|
serialNumber = CommonService.query_serial_with_uid(order['UID'])
|
|
|
data = {
|
|
|
'orderID': order['orderID'],
|
|
|
@@ -752,7 +757,8 @@ class serveManagement(View):
|
|
|
'status': order['status'],
|
|
|
'order_type': order['order_type'],
|
|
|
'payTime': order['payTime'] if order['payTime'] else 'N/A',
|
|
|
- 'serialNumber': 'N/A' if serialNumber == order['UID'] else serialNumber
|
|
|
+ 'serialNumber': 'N/A' if serialNumber == order['UID'] else serialNumber,
|
|
|
+ 'country': country
|
|
|
}
|
|
|
# 订单显示(或不显示)停用/退款功能
|
|
|
if order['order_type'] == 0 or order['order_type'] == 1: # 云存
|
