From 0412424c9735a48fabcff1efd022965e0cfeecc4 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 31 十月 2024 01:29:52 +0800
Subject: [PATCH] redis生效时间修改

---
 api/outside_api_command_callback.py |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index d49dafc..f54330e 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -384,6 +384,7 @@
             elif code_list_type == outside_api_command_manager.CODE_LIST_GREEN:
                 if operate == outside_api_command_manager.OPERRATE_SET:
                     gpcode_manager.GreenListCodeManager().add_code(code)
+                    gpcode_manager.WantBuyCodesManager().add_code(code)
                     name = gpcode_manager.get_code_name(code)
                     if not name:
                         results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -391,6 +392,7 @@
                             gpcode_manager.CodesNameManager.add_first_code_name(code, results[code])
                 elif operate == outside_api_command_manager.OPERRATE_DELETE:
                     gpcode_manager.GreenListCodeManager().remove_code(code)
+                    gpcode_manager.WantBuyCodesManager().remove_code(code)
                 elif operate == outside_api_command_manager.OPERRATE_GET:
                     codes = gpcode_manager.GreenListCodeManager().list_codes_cache()
                     datas = []
@@ -880,6 +882,8 @@
                                 order_begin_pos = OrderBeginPosInfo(buy_single_index=0, buy_exec_index=0)
                             l2_data_util.load_l2_data(code)
                             total_datas = l2_data_util.local_today_datas.get(code)
+                            if not total_datas:
+                                continue
                             trade_index, is_default = transaction_progress.TradeBuyQueue().get_traded_index(code)
                             if trade_index is None:
                                 trade_index = 0
@@ -1013,7 +1017,7 @@
                                     real_place_order_after_num += val["num"]
 
                             # 鑾峰彇褰撴棩鐨勯噺姣�
-                            volume_rate = code_volumn_manager.get_volume_rate(code)
+                            volume_rate = code_volumn_manager.CodeVolumeManager().get_volume_rate(code)
 
                             # 鏄惁闇�瑕佹敞鎰�
                             need_pay_attention = (total_left_count <= 10 or total_left_num * float(
@@ -1104,6 +1108,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)
@@ -1172,8 +1184,8 @@
             elif ctype == "set_per_code_buy_money":
                 # 璁剧疆鍗曞彧绁ㄧ殑涔板叆閲戦
                 money = data["money"]
-                if money > 30000:
-                    raise Exception("鏈�澶氬彧鑳借缃�3w")
+                if money > 50000:
+                    raise Exception("鏈�澶氬彧鑳借缃�5w")
                 constant.BUY_MONEY_PER_CODE = money
                 self.send_response({"code": 0, "data": {"money": constant.BUY_MONEY_PER_CODE}}, client_id, request_id)
             elif ctype == "get_per_code_buy_money":
@@ -1183,6 +1195,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"]
@@ -1270,6 +1284,10 @@
                 # 璁剧疆涔板叆閲戦鍜屾暟閲�
                 normal = data["normal"]
                 radical = data["radical"]
+                default_buy_money = data["default_buy_money"]
+                if int(default_buy_money) not in constant.AVAILABLE_BUY_MONEYS:
+                    raise Exception("榛樿閲戦涓嶅湪棰勮閲戦鍐�")
+                constant.BUY_MONEY_PER_CODE = default_buy_money
                 BuyMoneyAndCountSetting().set_normal_buy_data(normal[0], json.loads(normal[1]))
                 BuyMoneyAndCountSetting().set_radical_buy_data(radical[0], json.loads(radical[1]))
                 data = {
@@ -1284,7 +1302,8 @@
                 data = {
                     "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
                     "radical": BuyMoneyAndCountSetting().get_radical_buy_setting(),
-                    "moneys": constant.AVAILABLE_BUY_MONEYS
+                    "moneys": constant.AVAILABLE_BUY_MONEYS,
+                    "default_buy_money": constant.BUY_MONEY_PER_CODE
                 }
                 self.send_response({"code": 0, "data": data, "msg": f""},
                                    client_id,
@@ -1304,6 +1323,26 @@
                 self.send_response({"code": 0, "data": data, "msg": f""},
                                    client_id,
                                    request_id)
+            elif ctype == "get_place_order_settings":
+                # 鑾峰彇涔板叆涓嬪崟璁剧疆
+                data = {
+                    "radical_buy": {"price": (constant.MIN_CODE_RADICAL_BUY_PRICE, constant.MAX_CODE_RADICAL_BUY_PRICE),
+                                    "zyltgb": constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES}}
+                self.send_response({"code": 0, "data": data, "msg": f""},
+                                   client_id,
+                                   request_id)
+            elif ctype == "set_place_order_settings":
+                radical_buy = data.get("radical_buy")
+                if radical_buy:
+                    radical_buy = json.loads(radical_buy)
+                    constant.MIN_CODE_RADICAL_BUY_PRICE = radical_buy["price"][0]
+                    constant.MAX_CODE_RADICAL_BUY_PRICE = radical_buy["price"][1]
+                    constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES = radical_buy["zyltgb"]
+                self.send_response({"code": 0, "data": {}, "msg": f""},
+                                   client_id,
+                                   request_id)
+
+
 
         except Exception as e:
             logging.exception(e)

--
Gitblit v1.8.0