增加订单类型筛选查询功能

AdminController/ServeManagementController.py

@@ -603,6 +603,7 @@ class serveManagement(View):
         payType = request_dict.get('payType', None)
         status = request_dict.get('status', None)
         timeRange = request_dict.getlist('timeRange[]', None)
+        orderType = request_dict.get('orderType', None)
 
         if not all([pageNo, pageSize]):
             return response.json(444)
@@ -626,6 +627,8 @@ class serveManagement(View):
                 omqs = omqs.filter(payType=payType)
             if status:
                 omqs = omqs.filter(status=status)
+            if orderType:
+                omqs = omqs.filter(order_type=orderType)
             if timeRange:
                 startTime, endTime = int(
                     timeRange[0][:-3]), int(timeRange[1][:-3])

AdminController/UnicomManageController.py

@@ -168,10 +168,7 @@ class UnicomManageControllerView(View):
                         'createdTime': combo_order.created_time,
                         'updated_time': combo_order.updated_time}
                 unicom_combo_qs = UnicomCombo.objects.filter(id=combo_order.combo_id).values('combo_name')
-                if unicom_combo_qs.exists():
-                    data['comboName'] = unicom_combo_qs[0]['combo_name']
-                else:
-                    data['comboName'] = ''
+                data['comboName'] = unicom_combo_qs[0]['combo_name'] if unicom_combo_qs.exists() else ''
                 iccid = combo_order.iccid
                 unicom_device_qs = UnicomDeviceInfo.objects.filter(iccid__icontains=iccid).values('user_id', 'serial_no')
                 userID = unicom_device_qs[0]['user_id']
@@ -323,7 +320,6 @@ class UnicomManageControllerView(View):
         try:
             pay_type_list = []
             for pay_type in pay_type_qs:
-                pay_type_qs.exists()
                 pay_type_list.append(pay_type)
             return response.json(0, pay_type_list)
         except Exception as e:
@@ -374,7 +370,6 @@ class UnicomManageControllerView(View):
 
         list_data = []
         unicom_combo_qs = UnicomCombo.objects.filter().values('id', 'combo_type', 'combo_name')
-
         if not unicom_combo_qs.exists():
             return response.json(173)
         try:

AdminController/UserManageController.py

@@ -370,8 +370,8 @@ class UserManagement(View):
                 rid = role.rid if role else 1  # 不存在角色默认分配为'Users'
                 user_ex_qs = UserExModel.objects.filter(userID_id=device_user.userID).values('appBundleId')
                 app_bundle_id = user_ex_qs[0]['appBundleId'] if user_ex_qs.exists() else ''
-                region_country = CountryModel.objects.filter(id=device_user.region_country).values('country_name')
-                region_country = region_country[0]['country_name'] if region_country.exists() else '未知国家'
+                country_qs = CountryModel.objects.filter(id=device_user.region_country).values('country_name')
+                countryName = country_qs[0]['country_name'] if country_qs.exists() else '未知国家'
                 user_list.append({
                     'userID': device_user.userID,
                     'username': device_user.username,
@@ -382,7 +382,7 @@ class UserManagement(View):
                     'data_joined': device_user.data_joined.strftime("%Y-%m-%d %H:%M:%S"),
                     'last_login': device_user.last_login.strftime("%Y-%m-%d %H:%M:%S"),
                     'appBundleId': app_bundle_id,
-                    'region_country':region_country
+                    'countryName':countryName
                 })
             print('user_list: ', user_list)
             return response.json(0, {'list': user_list, 'total': total})