修改筛选4G流量套餐

AdminController/UnicomManageController.py

@@ -7,9 +7,9 @@
 import datetime
 import hashlib
 import json
+import random
 import threading
 import time
-import random
 import uuid
 from decimal import Decimal
 
@@ -26,6 +26,7 @@ from Controller.UnicomCombo.UnicomComboController import UnicomComboView
 from Model.models import UnicomDeviceInfo, UnicomCombo, Pay_Type, UnicomComboOrderInfo, Device_User, Order_Model, \
     ExchangeCode, UnicomFlowPush, SysMsgModel, UnicomComboExperienceHistory, LogModel, SerialNumberPackage, \
     AccessNumberTaskQueue
+from Object.EIoTClubObject import EIoTClubObject
 from Object.Enums.WXOperatorEnum import WXOperatorEnum
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
@@ -33,7 +34,6 @@ from Object.TokenObject import TokenObject
 from Object.UnicomObject import UnicomObjeect
 from Object.WXTechObject import WXTechObject
 from Service.CommonService import CommonService
-from Object.EIoTClubObject import EIoTClubObject
 from Service.TelecomService import TelecomService
 
 
@@ -490,7 +490,7 @@ class UnicomManageControllerView(View):
                         'expiration_days',
                         'expiration_type', 'price', 'is_unlimited',
                         'updated_time', 'created_time',
-                        'remark', 'is_show', 'sort', 'virtual_price').order_by('-updated_time','sort')
+                        'remark', 'is_show', 'sort', 'virtual_price').order_by('-created_time', 'sort')
             if not combo_qs.exists():
                 return response.json(0, [])
             total = combo_qs.count()
@@ -1055,7 +1055,10 @@ class UnicomManageControllerView(View):
         获取4G流量套餐列表
         @return: 套餐列表
         """
+        c_type = request_dict.get('type', None)
         combo_qs = UnicomCombo.objects.filter(is_del=False)
+        if c_type:
+            combo_qs = combo_qs.filter(combo_type=int(c_type))
         if not combo_qs.exists():
             return response.json(173)
         combo_qs = combo_qs.values('id', 'combo_name').order_by('-created_time')