From 31c03f7c3458ca00d66e04df0af53e7dc3438688 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 05 八月 2024 17:36:24 +0800 Subject: [PATCH] 调整账户资金管理目录/买入调整/增加手续费接口 --- trade/trade_manager.py | 38 +++----------------------------------- 1 files changed, 3 insertions(+), 35 deletions(-) diff --git a/trade/trade_manager.py b/trade/trade_manager.py index 8f66c02..60f3e74 100644 --- a/trade/trade_manager.py +++ b/trade/trade_manager.py @@ -13,6 +13,7 @@ from code_attribute import gpcode_manager from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager +from db.mysql_data_delegate import Mysqldb from db.redis_manager_delegate import RedisUtils from log_module import async_log_util from output import kp_client_msg_manager @@ -23,6 +24,7 @@ from log_module.log import * from trade.huaxin.huaxin_trade_record_manager import TradeOrderIdManager +from trade.trade_data_manager import AccountMoneyManager from utils import import_util, tool, huaxin_util trade_gui = import_util.import_lib("trade.trade_gui") @@ -298,40 +300,6 @@ # 璁剧疆浜ゆ槗璐︽埛鐨勫彲鐢ㄩ噾棰� -# 璐︽埛鍙敤璧勯噾绠$悊 -class AccountAvailableMoneyManager: - __db = 2 - __redis_manager = redis_manager.RedisManager(2) - __available_money_cache = None - __instance = None - - def __new__(cls, *args, **kwargs): - if not cls.__instance: - cls.__instance = super(AccountAvailableMoneyManager, cls).__new__(cls, *args, **kwargs) - __redis = cls.__get_redis() - result = RedisUtils.get(cls.__get_redis(), "trade-account-canuse-money") - if result: - cls.__available_money_cache = round(float(result), 2) - return cls.__instance - - @classmethod - def __get_redis(cls): - return cls.__redis_manager.getRedis() - - def set_available_money(self, client_id, money): - self.__available_money_cache = round(float(money), 2) - RedisUtils.set(self.__get_redis(), "trade-account-canuse-money", money) - - # 鑾峰彇浜ゆ槗璐︽埛鐨勫彲鐢ㄩ噾棰� - def get_available_money(self): - result = RedisUtils.get(self.__get_redis(), "trade-account-canuse-money") - if result is None: - return None - return round(float(result), 2) - - def get_available_money_cache(self): - return self.__available_money_cache - # 淇濆瓨浜ゆ槗鎴愬姛鐨勬暟鎹� def save_trade_success_data(datas, day=datetime.datetime.now().strftime("%Y%m%d")): @@ -439,7 +407,7 @@ return None, trade_state def is_money_enough(code): - money = AccountAvailableMoneyManager().get_available_money_cache() + money = AccountMoneyManager().get_available_money_cache() if money is None: return Exception("鏈幏鍙栧埌璐︽埛鍙敤璧勯噾"), None price = gpcode_manager.get_limit_up_price(code) -- Gitblit v1.8.0