Преглед изворни кода

后台物联卡没有绑定用户不出现在4G订单页面

zhangdongming пре 2 година
родитељ
комит
731e89be97
1 измењених фајлова са 18 додато и 5 уклоњено
  1. 18 5
      AdminController/UnicomManageController.py

+ 18 - 5
AdminController/UnicomManageController.py

@@ -12,8 +12,8 @@ from django.views.generic.base import View
 from Controller.UnicomCombo.UnicomComboController import UnicomComboView
 from Model.models import UnicomDeviceInfo, UnicomCombo, Pay_Type, UnicomComboOrderInfo, Device_User, Device_Info, \
     Order_Model
-from Object.UnicomObject import UnicomObjeect
 from Object.ResponseObject import ResponseObject
+from Object.UnicomObject import UnicomObjeect
 from Service.CommonService import CommonService
 
 
@@ -151,15 +151,14 @@ class UnicomManageControllerView(View):
             combo_order_info_qs = UnicomComboOrderInfo.objects.all()
             # 序列号查询
             if serial_no:
-                unicom_device_qs = UnicomDeviceInfo.objects.filter(serial_no__icontains=serial_no).values('serial_no',
-                                                                                                          'user_id',
-                                                                                                          'iccid')
+                unicom_device_qs = UnicomDeviceInfo.objects.filter(serial_no__icontains=serial_no) \
+                    .values('serial_no', 'user_id', 'iccid')
                 if not unicom_device_qs.exists():
                     return response.json(0, [])
                 combo_order_info_qs = combo_order_info_qs.filter(iccid__icontains=unicom_device_qs[0]['iccid'])
             # UID查询
             if UID:
-                device_qs = Device_Info.objects.filter(UID=UID).values('serial_number').distinct()
+                device_qs = Device_Info.objects.filter(UID=UID).values('serial_number')
                 if not device_qs.exists():
                     return response.json(0, [])
                 unicom_device_qs = UnicomDeviceInfo.objects.filter(
@@ -177,6 +176,8 @@ class UnicomManageControllerView(View):
             combo_order_info_qs = combo_order_info_qs.order_by('-created_time')[(page - 1) * line:page * line]
             data_list = []
             for combo_order in combo_order_info_qs:
+                if not UnicomManageControllerView.check_sim_user(combo_order.iccid):
+                    continue
                 data = {'userName': '',
                         'UID': '',
                         'iccid': combo_order.iccid,
@@ -216,6 +217,18 @@ class UnicomManageControllerView(View):
             print(e)
             return response.json(500, repr(e))
 
+    @staticmethod
+    def check_sim_user(iccid):
+        """
+        检查SIM卡用户
+        @param iccid:物联卡
+        @return:
+        """
+        u_device_qs = UnicomDeviceInfo.objects.filter(iccid=iccid).values('user_id')
+        if not u_device_qs.exists() or not u_device_qs[0]['user_id']:
+            return False
+        return True
+
     @classmethod
     def edit_combo(cls, request_dict, response):
         """