|
@@ -1046,7 +1046,7 @@ class serveManagement(View):
|
|
uid = request_dict.get('uid', None)
|
|
uid = request_dict.get('uid', None)
|
|
channel = request_dict.get('channel', None)
|
|
channel = request_dict.get('channel', None)
|
|
orderID = request_dict.get('orderID', None)
|
|
orderID = request_dict.get('orderID', None)
|
|
- order_list = request_dict.get('order_list', None)
|
|
|
|
|
|
+ order_ids = request_dict.get('order_ids', None)
|
|
userID__username = request_dict.get('userID__username', None)
|
|
userID__username = request_dict.get('userID__username', None)
|
|
currency = request_dict.get('currency', None)
|
|
currency = request_dict.get('currency', None)
|
|
payType = request_dict.get('payType', None)
|
|
payType = request_dict.get('payType', None)
|
|
@@ -1085,9 +1085,9 @@ class serveManagement(View):
|
|
omqs = omqs.filter(trade_no=trade_no)
|
|
omqs = omqs.filter(trade_no=trade_no)
|
|
if userID__phone:
|
|
if userID__phone:
|
|
omqs = omqs.filter(userID__phone=userID__phone)
|
|
omqs = omqs.filter(userID__phone=userID__phone)
|
|
- if order_list:
|
|
|
|
- order_list = order_list.split(',')
|
|
|
|
- omqs = omqs.filter(Q(orderID__in=order_list) | Q(trade_no__in=order_list))
|
|
|
|
|
|
+ if order_ids:
|
|
|
|
+ order_ids = order_ids.split(',')
|
|
|
|
+ omqs = omqs.filter(Q(orderID__in=order_ids) | Q(trade_no__in=order_ids))
|
|
if serialNumber:
|
|
if serialNumber:
|
|
device_uid = CommonService.query_uid_with_serial(serialNumber)
|
|
device_uid = CommonService.query_uid_with_serial(serialNumber)
|
|
omqs = omqs.filter(UID=device_uid)
|
|
omqs = omqs.filter(UID=device_uid)
|
|
@@ -1287,12 +1287,12 @@ class serveManagement(View):
|
|
"rank__price", "status", "order_type", "paymentID", "trade_no", "payTime", "userID__region_country",
|
|
"rank__price", "status", "order_type", "paymentID", "trade_no", "payTime", "userID__region_country",
|
|
"userID__phone").order_by('-addTime')
|
|
"userID__phone").order_by('-addTime')
|
|
while True:
|
|
while True:
|
|
- params = {'pageNo': 1, 'pageSize': 100, 'order_list': item['order_ids']}
|
|
|
|
|
|
+ params = {'pageNo': 1, 'pageSize': 100, 'order_ids': item['order_ids']}
|
|
eur_response = requests.get('https://www.zositeche.com/serveManagement/getDeviceOrderList', params)
|
|
eur_response = requests.get('https://www.zositeche.com/serveManagement/getDeviceOrderList', params)
|
|
if eur_response.status_code == 200:
|
|
if eur_response.status_code == 200:
|
|
result = eur_response.json()
|
|
result = eur_response.json()
|
|
- if result['result_code'] == 0:
|
|
|
|
- item['order_info'] = result['result']['list']
|
|
|
|
|
|
+ if result['code'] == 0:
|
|
|
|
+ item['order_info'] = result['data']['list']
|
|
break
|
|
break
|
|
for order in order_qs:
|
|
for order in order_qs:
|
|
# 查询国家信息
|
|
# 查询国家信息
|