Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer

AdminController/SerialManageController.py

@@ -15,6 +15,7 @@ from django.views.generic.base import View
 from Model.models import CompanyModel, SerialNumberModel, VPGModel, UIDModel, UIDCompanySerialModel, CompanySerialModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
+from Service.CommonService import CommonService
 
 
 class SerialView(View):
@@ -102,6 +103,14 @@ class SerialView(View):
 
     @classmethod
     def vpg_page(cls, request_dict, response):
+
+        isSelect = request_dict.get('isSelect', None)
+        if isSelect:
+            # 获取vpg id作为选项
+            vpg_qs = VPGModel.objects.all().values('id')
+            return response.json(
+                0, {'list': CommonService.qs_to_list(vpg_qs)})
+
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
         if not all([pageNo, pageSize]):
@@ -131,12 +140,13 @@ class SerialView(View):
 
     @classmethod
     def uid_page(cls, request_dict, response):
-        pageNo = request_dict.get('pageNo', None)
-        pageSize = request_dict.get('pageSize', None)
+        vpg_id = request_dict.get('vpg_id', None)
         status = request_dict.get('status', None)
         serial_number = request_dict.get('serialNumber', None)
         uid = request_dict.get('uid', None)
         p2p_type = request_dict.get('p2pType', None)
+        pageNo = request_dict.get('pageNo', None)
+        pageSize = request_dict.get('pageSize', None)
         if not all([pageNo, pageSize]):
             return response.json(444)
         page = int(pageNo)
@@ -152,6 +162,8 @@ class SerialView(View):
                     if uid_company_serial_qs.exists():
                         uid_id = uid_company_serial_qs[0]['uid_id']
                         query = query.filter(id=uid_id)
+            if vpg_id:
+                query = query.filter(vpg_id=int(vpg_id))
             if status:
                 query = query.filter(status=int(status))
             if uid:
@@ -161,7 +173,7 @@ class SerialView(View):
             if not query.exists():
                 return response.json(0, {'list': '', 'total': 0})
             total = query.count()
-            uid_page = query.order_by('-add_time')[(page - 1) * line:page * line]
+            uid_page = query[(page - 1) * line:page * line]
             result_list = []
             if not uid_page.exists():
                 return response.json(0, {'list': '', 'total': 0})
@@ -175,17 +187,19 @@ class SerialView(View):
                     if company_serial_qs.exists():
                         serial = str(company_serial_qs[0]['serial_number'])
                 result_list.append({
+                    'vpg_id': vo.vpg_id,
                     'id': vo.id,
                     'uid': vo.uid,
-                    'mac': vo.mac,
-                    'extra': vo.uid_extra,
                     'serial': serial,
                     'status': vo.status,
                     'area': vo.area,
                     'p2pType': vo.p2p_type,
+                    'platform': vo.platform,
                     'fullUidCode': vo.full_uid_code,
+                    'init_string': vo.init_string,
+                    'init_string_app': vo.init_string_app,
+                    'addTime': vo.add_time,
                     'updateTime': vo.update_time,
-                    'addTime': vo.add_time
                 })
             return response.json(0, {'list': result_list, 'total': total})
 

Controller/PaymentCycle.py

@@ -265,7 +265,7 @@ class PaypalCycleNotify(View):
                 sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功订阅云存套餐',
                                      'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                          "%b %dth,%Y", time.localtime())]
-                CloudStorage.CloudStorageView.do_vod_msg_Notice(self, UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
+                CloudStorage.CloudStorageView().do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
 
                 # return response.json(0)
                 red_url = "{SERVER_DOMAIN_SSL}web/paid2/success.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
@@ -442,7 +442,7 @@ class PaypalCycleNotify(View):
                             lang = 'en'
                         else:
                             lang = 'cn'
-                        CloudStorage.CloudStorageView.do_vod_msg_Notice(self, UID, channel, userid, lang,
+                        CloudStorage.CloudStorageView().do_vod_msg_Notice(UID, channel, userid, lang,
                                                                         sys_msg_text_list, 'SMS_219738485')
                         logger.info('-----------------------result')
                         logger.info('success')
@@ -616,7 +616,7 @@ class PaypalCycleNotify(View):
                             lang = 'en'
                         else:
                             lang = 'cn'
-                        CloudStorage.CloudStorageView.do_vod_msg_Notice(self, UID, channel, userid, lang,
+                        CloudStorage.CloudStorageView().do_vod_msg_Notice(UID, channel, userid, lang,
                                                                         sys_msg_text_list, 'SMS_219738485')
                         return HttpResponse('success')
                 except Exception as e: