查询订单返回用户国家信息

AdminController/ServeManagementController.py

@@ -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
@@ -199,7 +199,7 @@ class serveManagement(View):
                 0, {'list': vod_bucket_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def addOrEditVodBucket(self, userID, request_dict, response):
         # 添加/编辑存储桶
@@ -245,7 +245,7 @@ class serveManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def deleteVodBucket(self, userID, request_dict, response):
         # 删除存储桶
@@ -258,7 +258,7 @@ class serveManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def getStoreMealList(self, userID, request_dict, response):
         # 获取云存套餐信息数据
@@ -336,7 +336,7 @@ class serveManagement(View):
                 0, {'list': store_meal_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def addOrEditStoreMeal(self, userID, request_dict, response):
         # 添加/编辑套餐
@@ -392,7 +392,7 @@ class serveManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def deleteStoreMeal(self, userID, request_dict, response):
         # 删除套餐信息
@@ -405,7 +405,7 @@ class serveManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def getStoreMealLanguage(self, userID, request_dict, response):
         # 获取套餐语言
@@ -451,7 +451,7 @@ class serveManagement(View):
                 0, {'list': store_meal_lang_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def addOrEditStoreMealLanguage(self, userID, request_dict, response):
         # 添加/编辑套餐语言
@@ -503,7 +503,7 @@ class serveManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def deleteStoreMealLanguage(self, userID, request_dict, response):
         # 删除套餐语言
@@ -522,7 +522,7 @@ class serveManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def getCdkList(self, userID, request_dict, response):
         # 获取激活码列表
@@ -577,7 +577,7 @@ class serveManagement(View):
                 0, {'list': list(cdk_qs), 'total': count})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def editExpress(self, request_dict, response):
         order_id = request_dict.get('orderID', None)
@@ -588,7 +588,7 @@ class serveManagement(View):
             CDKcontextModel.objects.filter(order=order_id).update(express_id=express_id)
             return response.json(0)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def getVodStoreMeal(self, response):
         try:
@@ -601,7 +601,7 @@ class serveManagement(View):
                 store_meal_list.append({'id': item['id'], 'title': item['lang__title'] + '--' + item['lang__content']})
             return response.json(0, store_meal_list)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def createCdk(self, request_dict, response):
         cdk_num = request_dict.get("cdknum", None)
@@ -643,7 +643,7 @@ class serveManagement(View):
             CDKcontextModel.objects.get(id=cdk_id).delete()
             return response.json(0)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def downloadCDK(self, request_dict, response):
         region = request_dict.get('region', None)
@@ -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", "userID__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['userID__region_country']).values('country_name')
+                if country_qs.exists():
+                    country = country_qs[0]['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:  # 云存
@@ -790,7 +796,7 @@ class serveManagement(View):
                 0, {'list': order_list, 'total': count})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def vodOrderReconcile(self, request, request_dict, response):
 
@@ -910,7 +916,7 @@ class serveManagement(View):
             return res
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def deleteDeviceOrder(self, userID, request_dict, response):
         orderID = request_dict.get('orderID', None)
@@ -955,7 +961,7 @@ class serveManagement(View):
                 0, {'list': list(ubqs), 'total': count})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def deleteDevicePackage(self, userID, request_dict, response):
         orderID = request_dict.get('orderID', None)
@@ -1150,7 +1156,7 @@ class serveManagement(View):
                 0, {'list': list_data, 'total': count})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def exportCloudUserList(self, request_dict, response):
         # UID_Bucket表查询数据
@@ -1365,7 +1371,7 @@ class serveManagement(View):
             return response
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def getCloudDataList(self, request_dict, response):
         year = request_dict.get('year', None)
@@ -1422,7 +1428,7 @@ class serveManagement(View):
             return response.json(0, {'list': list_data})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @classmethod
     def deviceAttritionAlert(cls, request_dict, response):
@@ -1618,7 +1624,7 @@ class serveManagement(View):
                 return response.json(173)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def cloudDataExport(self, request_dict, response):
         """