优化扫码检测接口、优化序列号占用提示”请联系客服“

Controller/SerialNumberController.py

@@ -627,7 +627,7 @@ class SerialNumberView(View):
             elif company_serial.status == 3:  # 已占用
                 sync_success = self.sync_serial_data_and_log(request, company_serial.id, serial_number, now_time)
                 if not sync_success:
-                    return response.json(10042)
+                    return response.json(10044)
                 return response.json(0, self.get_uid_info_by_serial(company_serial.id))
         except Exception as e:
             error_logger = logging.getLogger('django')

Controller/TestApi.py

@@ -986,56 +986,66 @@ class testView(View):
             if not serial_number:
                 return response.json(0)
             results_data = []
-            if not CONFIG_INFO == 'cn':
+            if not CONFIG_INFO == "cn":
                 return response.json(0, results_data)
             local_response = cls.getSerialNumberInfo(request_dict, response)
             res = json.loads(local_response.content)
-            res['result']['server'] = 1
-            res['result']['serverName'] = '中国服'
-            res['result']['domainName'] = 'https://www.zositechc.cn'
-            results_data.append(res['result'])
-            res1 = requests.post("http://www.dvema.com/testApi/getSerialNumberInfo",
-                                 data={'serialNumber': serial_number}, timeout=15)
+            res["result"]["server"] = 1
+            res["result"]["serverName"] = "中国服"
+            res["result"]["domainName"] = "https://www.zositechc.cn"
+            results_data.append(res["result"])
+
+            res1 = requests.post("https://www.dvema.com/testApi/getSerialNumberInfo",
+                                 data={"serialNumber": serial_number}, timeout=15)
             results1 = json.loads(res1.text)
-            results1['result']['server'] = 2
-            results1['result']['serverName'] = '美国服'
-            results1['result']['domainName'] = 'https://www.dvema.com'
-            results_data.append(results1['result'])
+            results1["result"]["server"] = 2
+            results1["result"]["serverName"] = "美国服"
+            results1["result"]["domainName"] = "https://www.dvema.com"
+            results_data.append(results1["result"])
+
             res2 = requests.post("https://api.zositeche.com/testApi/getSerialNumberInfo",
                                  data={'serialNumber': serial_number}, timeout=15)
             results2 = json.loads(res2.text)
             results2['result']['server'] = 3
-            results2['result']['serverName'] = '欧洲服'
-            results2['result']['domainName'] = 'https://api.zositeche.com'
+            results2["result"]["serverName"] = "欧洲服"
+            results2["result"]["domainName"] = "https://api.zositeche.com"
             results_data.append(results2['result'])
+
+            res3 = requests.post("https://test.zositechc.cn/testApi/getSerialNumberInfo",
+                                 data={'serialNumber': serial_number}, timeout=15)
+            results3 = json.loads(res3.text)
+            results3['result']['server'] = 4
+            results3["result"]["serverName"] = "测试服"
+            results3["result"]["domainName"] = "https://test.zositeche.cn"
+            results_data.append(results3['result'])
+
             is_ok = True
-            operation = ''
-            status_log = ''
+            operation = ""
+            status_log = ""
             for item in results_data:
-                if item['status'] == '绑定uid':
+                if item["status"] == "绑定uid":
                     is_ok = False
-                    operation = '{}序列号已绑定UID'.format(serial_number)
-                    LOGGER.info('序列号检测状态已绑定:{}'.format(serial_number))
+                    operation = "检测{}序列号已绑定UID".format(serial_number)
+                    LOGGER.info("序列号检测状态已绑定:{}".format(serial_number))
                     break
-                elif item['status'] == '已占用':
-                    status_log = '序列号检测状态已占用:{}'.format(serial_number)
+                elif item["status"] == "已占用":
+                    status_log = "序列号检测状态已占用:{}".format(serial_number)
             if is_ok:
                 LOGGER.info(status_log)
-                LOGGER.info('序列号检测状态正常{}'.format(serial_number))
+                LOGGER.info("序列号检测状态正常{}".format(serial_number))
                 return response.json(0, results_data)
             log = {
-                'ip': CommonService.get_ip_address(request),
-                'user_id': 1,
-                'status': 200,
-                'time': int(time.time()),
-                'operation': operation,
-                'url': 'testApi/get-serial-details',
+                "ip": CommonService.get_ip_address(request),
+                "user_id": 1,
+                "status": 200,
+                "time": int(time.time()),
+                "operation": operation,
+                "url": "testApi/get-serial-details",
             }
             LogModel.objects.create(**log)
             return response.json(0, results_data)
         except Exception as e:
-            LOGGER.info('扫码检测序列号异常详情,errLine:{}, errMsg:{}'
-                        .format(e.__traceback__.tb_lineno, repr(e)))
+            LOGGER.info("异常详情,errLine:{}, errMsg:{}".format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(500)
 
     @staticmethod

Object/uidManageResponseObject.py

@@ -63,6 +63,7 @@ class uidManageResponseObject(object):
             10041: '已超出序列号剩余可绑定数',
             10042: '序列号已被占用',
             10043: '无法解绑,序列号的状态为被占用',
+            10044: '请联系客服',
         }
 
         data_en = {
@@ -116,6 +117,7 @@ class uidManageResponseObject(object):
             10041: 'The remaining number of serial numbers that can be bound has exceeded',
             10042: 'Serial number is already occupied',
             10043: 'Unable to unbind, the status of the serial number is occupied',
+            10044: 'Please contact customer service',
         }
 
         msg = data_cn if self.lang == 'cn' else data_en