From 31c03f7c3458ca00d66e04df0af53e7dc3438688 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 05 八月 2024 17:36:24 +0800 Subject: [PATCH] 调整账户资金管理目录/买入调整/增加手续费接口 --- servers/data_server.py | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/servers/data_server.py b/servers/data_server.py index 87a8b68..8eb8342 100644 --- a/servers/data_server.py +++ b/servers/data_server.py @@ -26,7 +26,8 @@ from urllib.parse import parse_qs from output import code_info_output, limit_up_data_filter, output_util, kp_client_msg_manager -from trade import bidding_money_manager, trade_manager, l2_trade_util, trade_record_log_util, trade_constant +from trade import bidding_money_manager, trade_manager, l2_trade_util, trade_record_log_util, trade_constant, \ + trade_data_manager import concurrent.futures # 绂佺敤http.server鐨勬棩蹇楄緭鍑� @@ -388,7 +389,7 @@ num = total_datas[trade_progress]['val']['num'] if dealing_active_info and dealing_info[0] == dealing_active_info[0]: if tool.is_sh_code(code): - num += dealing_active_info[1]//100 + num += dealing_active_info[1] // 100 percent = int(dealing_info[1] / num) response_data = json.dumps( {"code": 0, "data": {"trade_progress": trade_progress, "is_default": is_default, "percent": percent}}) @@ -706,6 +707,23 @@ except Exception as e: logger_debug.exception(e) + elif url.path == "/get_account_commission_detail": + # 鑾峰彇鎵嬬画璐硅鎯� + try: + fdata = {"delegates": {}} + delegates = trade_data_manager.AccountMoneyManager().get_delegated_count_info() + delegates = [{"count": x[1], "price": 0.1, "money": round(0.1 * x[1], 2)} for x in delegates] + fdata["delegates"]["buy"] = delegates[0] + fdata["delegates"]["buy_cancel"] = delegates[1] + fdata["delegates"]["sell_cancel"] = delegates[2] + fdata["delegates"]["sell"] = delegates[3] + deal_count = trade_data_manager.AccountMoneyManager().get_deal_count() + fdata["deal"] = {"count": deal_count, "price": 5, "money": round(5 * deal_count, 2)} + fdata["commission"] = trade_data_manager.AccountMoneyManager().get_commission_cache() + response_data = json.dumps({"code": 0, "data": fdata}) + except Exception as e: + logger_debug.exception(e) + async_log_util.info(logger_request_api, f"缁撴潫璇锋眰{tool.get_thread_id()}-{url}") self.send_response(200) # 鍙戠粰璇锋眰瀹㈡埛绔殑鍝嶅簲鏁版嵁 @@ -788,6 +806,7 @@ self.__kplDataManager.save_data(type_, result_list_) except Exception as e: logger_debug.exception(e) + # 灏�"姒傚康"浜屽瓧鏇挎崲鎺� data = data_origin type_ = data["type"] -- Gitblit v1.8.0