优化序列号占用返回提示”请联系客服“,修改检测序列号绑定信息返回测试服数据

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

@@ -907,16 +907,15 @@ class testView(View):
             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,
-            )
+
+            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"])
+
             res2 = requests.post("https://api.zositeche.com/testApi/getSerialNumberInfo",
                                  data={'serialNumber': serial_number}, timeout=15)
             results2 = json.loads(res2.text)
@@ -924,13 +923,22 @@ class testView(View):
             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 = ""
             for item in results_data:
                 if item["status"] == "绑定uid":
                     is_ok = False
-                    operation = "{}序列号已绑定UID".format(serial_number)
+                    operation = "检测{}序列号已绑定UID".format(serial_number)
                     LOGGER.info("序列号检测状态已绑定:{}".format(serial_number))
                     break
                 elif item["status"] == "已占用":

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