From 38395204ab04bbca22a5e22be988d826afd5b227 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 10 十一月 2022 15:46:27 +0800
Subject: [PATCH] 修复bug，优化下单
---
l2_code_operate.py | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/l2_code_operate.py b/l2_code_operate.py
index 22ba54a..23b19fb 100644
--- a/l2_code_operate.py
+++ b/l2_code_operate.py
@@ -53,6 +53,7 @@
L2CodeOperate.set_operate_code_state(client_id, position, 1)
except Exception as e:
+ logging.exception(e)
logger_code_operate.error("setGPCode鍑洪敊锛歿}", str(e))
finally:
gpcode_manager.rm_operate(gpcode)
@@ -78,20 +79,20 @@
# print("璇诲彇鎿嶄綔闃熷垪", data, redis.llen("code_operate_queue"))
if data is not None:
data = json.loads(data)
- logger_code_operate.info("璇诲彇鎿嶄綔闃熷垪锛歿}", data)
+ # logger_code_operate.info("璇诲彇鎿嶄綔闃熷垪锛歿}", data)
type, code = data["type"], data["code"]
create_time = data.get("create_time")
if create_time is not None:
# 璁剧疆10s瓒呮椂鏃堕棿
- if round(time.time() * 1000) - create_time > 20 * 1000:
- logger_code_operate.debug("璇诲彇鎿嶄綔瓒呮椂锛歿}", data)
+ if round(time.time() * 1000) - create_time > 15 * 1000:
+ # logger_code_operate.debug("璇诲彇鎿嶄綔瓒呮椂锛歿}", data)
continue
if type == 0:
# 鏄惁鍦ㄥ浐瀹氬簱
if l2_data_manager.is_in_l2_fixed_codes(code):
continue
- if gpcode_manager.is_listen(code) and not gpcode_manager.is_operate(code):
+ if gpcode_manager.is_listen_old(code) and not gpcode_manager.is_operate(code):
client_id, pos = gpcode_manager.get_listen_code_pos(code)
if client_id is not None and pos is not None:
L2CodeOperate.setGPCode(client_id, pos, "")
@@ -99,7 +100,7 @@
if l2_trade_util.is_in_forbidden_trade_codes(code):
continue
- if not gpcode_manager.is_listen(code) and not gpcode_manager.is_operate(
+ if not gpcode_manager.is_listen_old(code) and not gpcode_manager.is_operate(
code) and not gpcode_manager.is_listen_full():
client_id, pos = gpcode_manager.get_can_listen_pos()
if pos is not None and client_id is not None:
@@ -120,13 +121,13 @@
L2CodeOperate.setGPCode(client_id, pos, code)
# 淇l2鐨勬暟鎹敊璇�
elif type == 3:
- if tool.is_set_code_time():
+ if tool.is_repaire_time():
client = data["client"]
data = data["data"]
result = server.send_msg(client, data)
print("L2鏁告摎淇京绲愭灉锛�", result)
else:
- print("闈炰氦鏄撴椂闂达紝鏀惧純淇L2")
+ print("闈炰慨澶嶆椂闂达紝鏀惧純淇L2")
elif type == 4:
# 娓呯悊鐩戝惉浣嶇疆
client = data["client"]
@@ -172,7 +173,7 @@
# 绉婚櫎鐩戞帶
def remove_l2_listen(self, code, msg):
# 鏄惁姝ｅ湪鐩戝惉
- if gpcode_manager.is_listen(code):
+ if gpcode_manager.is_listen_old(code):
self.add_operate(0, code, msg=msg)
# 璁剧疆浠ｇ爜鎿嶄綔鐘舵�侊紝鏈嶅姟鍣ㄤ繚瀛樼殑浠ｇ爜鏄惁涓庡疄闄呰缃殑浠ｇ爜淇濇寔涓�鑷�
@@ -213,8 +214,8 @@
__reset_code_dict[key] = round(time.time() * 1000)
if code_ is None:
code_ = ""
- if tool.is_set_code_time():
- L2CodeOperate.repaire_operate(int(client), int(channel), code_)
+ if tool.is_repaire_time():
+ L2CodeOperate().repaire_operate(int(client), int(channel), code_)
else:
key = "{}-{}".format(client, channel)
if key not in __set_operate_code_state_dict or round(
@@ -249,8 +250,8 @@
for index in range(0, 8):
code = gpcode_manager.get_listen_code_by_pos(client_id, index)
if code is not None and len(code) > 0 and index_codes.get(index) != code:
- # 浜ゆ槗鏃堕棿鎵嶄慨澶嶄唬鐮�
- if tool.is_set_code_time():
+ # 淇鏃堕棿鎵嶄慨澶嶄唬鐮�
+ if tool.is_repaire_time():
L2CodeOperate().repaire_operate(client_id, index, code)
elif code is None or len(code) == 0 and index_codes.get(index) is not None:
# 鍒犻櫎鍓嶇浠ｇ爜浣�
--
Gitblit v1.8.0