APP升级提示

Controller/AppSetController.py

@@ -76,11 +76,16 @@ class AppSetView(View):
                 sm_qs = sm_qs.values("content")
                 # 添加到缓存，缓存时间为3600秒------指的是一个钟后再次访问，就会刷新缓存一次
                 dict_json = json.loads(sm_qs[0]['content'])
-                if 'editionUpgrading' in dict_json and dict_json['editionUpgrading'] == 1:
-                    if lang !='cn':
-                        dict_json['editionUpgrading'] = 'Upgrading, please sign in later'
+                if 'editionUpgrading' in dict_json :
+                    if  dict_json['editionUpgrading'] == 1:
+                        if lang !='cn':
+                            dict_json['editionUpgrading'] = 'Upgrading, please sign in later'
+                        else:
+                            dict_json['editionUpgrading'] = '正在升级，请稍后登录'
                     else:
-                        dict_json['editionUpgrading'] = '正在升级，请稍后登录'
+                        dict_json.pop('editionUpgrading')
+
+
 
                 content_json_str = dict_json
 

Controller/SerialNumberController.py

@@ -203,21 +203,11 @@ class SerialNumberView(View):
             try:
                 try:
 
-                    # 判断序列号是否已和UID关联
+                    # 判断序列号是否已和企业关联
                     company_serial_qs = CompanySerialModel.objects.filter(company__secret=company_id,
                                                                           serial_number__serial_number=serial)
                     if not company_serial_qs.exists():
-                        uid_company_serial_qs = UIDCompanySerialModel.objects.filter(company_serial__company__mark=mark,
-                                                                                     company_serial__serial_number__serial_number=serial)
-
-                        uid = uid_company_serial_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra')[0]
-
-                        res = {
-                            'uid': CommonService.encode_data(uid['uid__uid']),
-                            'mac': CommonService.encode_data(uid['uid__mac']),
-                            'extra': uid['uid__uid_extra']
-                        }
-                        return response.json(0, res)
+                        return response.json(173)
 
 
                     # 当序列号已关联UID