From befe1e660da97a583781d7948aebf23da8424493 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 10 十月 2024 14:21:51 +0800
Subject: [PATCH] bug修复
---
api/outside_api_command_callback.py | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 0c7baa3..a5b5ee6 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -45,6 +45,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.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
@@ -280,10 +281,14 @@
code_list_type = data["code_list_type"]
operate = data["operate"]
code = data.get("code")
+ if code and not tool.is_can_buy_code(code):
+ raise Exception(f"涓嶆槸鍙互浜ゆ槗鐨勪唬鐮侊細{code}")
fresult = {"code": 0}
if code_list_type == outside_api_command_manager.CODE_LIST_WANT:
if operate == outside_api_command_manager.OPERRATE_SET:
gpcode_manager.WantBuyCodesManager().add_code(code)
+ # 鍔犳兂涔板崟瑕佷粠榛戝悕鍗曠Щ闄�
+ l2_trade_util.remove_from_forbidden_trade_codes(code)
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -438,7 +443,7 @@
white = gpcode_manager.WhiteListCodeManager().is_in_cache(code)
black = l2_trade_util.is_in_forbidden_trade_codes(code)
pause_buy = gpcode_manager.PauseBuyCodesManager().is_in_cache(code)
-
+ must_buy = gpcode_manager.MustBuyCodesManager().is_in_cache(code)
desc_list = []
if want:
desc_list.append("銆愭兂涔板崟銆�")
@@ -448,6 +453,9 @@
desc_list.append("銆愰粦鍚嶅崟銆�")
if pause_buy:
desc_list.append("銆愭殏涓嶄拱銆�")
+ if must_buy:
+ desc_list.append("銆愮孩鍚嶅崟銆�")
+
result = {"code": 0, "data": {"code_info": (code, code_name), "desc": "".join(desc_list)}}
self.send_response(result, client_id, request_id)
except Exception as e:
@@ -1252,6 +1260,29 @@
self.send_response({"code": 0, "data": data, "msg": f""},
client_id,
request_id)
+ elif ctype == "set_buy_money_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ normal = data["normal"]
+ radical = data["radical"]
+ BuyMoneyAndCountSetting().set_normal_buy_data(normal[0], json.loads(normal[1]))
+ BuyMoneyAndCountSetting().set_radical_buy_data(radical[0], json.loads(radical[1]))
+ data = {
+ "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting()
+ }
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "get_buy_money_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data = {
+ "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting(),
+ "moneys":constant.AVAILABLE_BUY_MONEYS
+ }
+ 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