From bea977458173f2e60971bad2d6f1e3183070c5ca Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 21 十月 2024 10:21:56 +0800
Subject: [PATCH] bug修改
---
api/outside_api_command_callback.py | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 5f800bc..86ca4f3 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -1,3 +1,4 @@
+import base64
import concurrent.futures
import copy
import json
@@ -45,7 +46,7 @@
from third_data.third_blocks_manager import CodeThirdBlocksManager, SOURCE_TYPE_KPL, BlockMapManager
from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant
import l2_data_util as l2_data_util_old
-from trade.buy_money_count_setting import BuyMoneyAndCountSetting
+from trade.buy_money_count_setting import BuyMoneyAndCountSetting, RadicalBuyBlockCodeCountManager
from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
@@ -458,7 +459,6 @@
desc_list.append("銆愮孩鍚嶅崟銆�")
if green:
desc_list.append("銆愮豢鍚嶅崟銆�")
-
result = {"code": 0, "data": {"code_info": (code, code_name), "desc": "".join(desc_list)}}
self.send_response(result, client_id, request_id)
@@ -1104,6 +1104,14 @@
except:
pass
+ try:
+ if order_begin_pos:
+ fdata['mode'] = order_begin_pos.mode
+ else:
+ fdata['mode'] = -1
+ except:
+ pass
+
fdatas.append(fdata)
except Exception as e:
logger_debug.exception(e)
@@ -1183,6 +1191,8 @@
kpl_data_manager.PullTask.repaire_pull_task()
# 淇鏁版嵁鏈嶅姟
server_util.repaire_data_server()
+ # 浠诲姟淇
+ huaxin_trade_data_update.repaire_task()
self.send_response({"code": 0, "data": {}}, client_id, request_id)
elif ctype == "get_trade_queue":
code = data["code"]
@@ -1284,11 +1294,27 @@
data = {
"normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
"radical": BuyMoneyAndCountSetting().get_radical_buy_setting(),
- "moneys":constant.AVAILABLE_BUY_MONEYS
+ "moneys": constant.AVAILABLE_BUY_MONEYS
}
self.send_response({"code": 0, "data": data, "msg": f""},
client_id,
request_id)
+ elif ctype == "set_radical_buy_block_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data_str = data["data"]
+ data_str = base64.b64decode(data_str).decode('utf-8')
+ setting = json.loads(data_str)
+ RadicalBuyBlockCodeCountManager().set_block_code_count(setting)
+ self.send_response({"code": 0, "data": setting, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "get_radical_buy_block_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data = RadicalBuyBlockCodeCountManager().get_block_code_count_settings()
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+
except Exception as e:
logging.exception(e)
logger_debug.exception(e)
--
Gitblit v1.8.0