From 32a96952b6fc3429ca03668298e8efbd6a23daa0 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 10 十月 2024 13:36:31 +0800
Subject: [PATCH] bug修复
---
api/outside_api_command_callback.py | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 0ac54ec..6373874 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -285,6 +285,8 @@
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])
@@ -439,7 +441,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("銆愭兂涔板崟銆�")
@@ -449,6 +451,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:
@@ -1257,8 +1262,8 @@
# 璁剧疆涔板叆閲戦鍜屾暟閲�
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]))
+ 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()
@@ -1270,7 +1275,8 @@
# 璁剧疆涔板叆閲戦鍜屾暟閲�
data = {
"normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
- "radical": BuyMoneyAndCountSetting().get_radical_buy_setting()
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting(),
+ "moneys":constant.AVAILABLE_BUY_MONEYS
}
self.send_response({"code": 0, "data": data, "msg": f""},
client_id,
--
Gitblit v1.8.0