From 5ed30c03ddfedd4cf79cd8fea9fc45b05821d898 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 16 十月 2023 12:44:07 +0800
Subject: [PATCH] 真实下单位置计算方法修改

---
 code_attribute/gpcode_manager.py |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py
index 2abf49c..425d809 100644
--- a/code_attribute/gpcode_manager.py
+++ b/code_attribute/gpcode_manager.py
@@ -5,17 +5,19 @@
 import time
 
 import constant
-from db import redis_manager
-from db.redis_manager import RedisUtils
+from db import redis_manager_delegate as redis_manager
+from db.redis_manager_delegate import RedisUtils
 from utils import tool
 import decimal
 
 from ths import l2_listen_pos_health_manager, client_manager
 
 __redisManager = redis_manager.RedisManager(0)
+__db = 0
 
 
 class CodesNameManager:
+    __db = 0
     redisManager = redis_manager.RedisManager(0)
     __gp_list_names_first_cache = []
 
@@ -83,7 +85,7 @@
     # 璁剧疆棣栨澘浠g爜鍚嶇О
     @classmethod
     def set_first_code_names(cls, datas):
-        RedisUtils.set(cls.__get_redis(), "gp_list_names_first", json.dumps(datas))
+        RedisUtils.set_async(cls.__db, "gp_list_names_first", json.dumps(datas))
 
     # 鍒犻櫎棣栨澘浠g爜鍚嶇О
     @classmethod
@@ -130,6 +132,7 @@
 # 棣栨澘浠g爜绠$悊
 class FirstCodeManager:
     __instance = None
+    __db = 0
 
     def __new__(cls, *args, **kwargs):
         if not cls.__instance:
@@ -151,11 +154,11 @@
         hasChanged = False
         for code in codes:
             if code not in self.__first_code_record_cache:
-                RedisUtils.sadd(self.__get_redis(), "first_code_record", code)
+                RedisUtils.sadd_async(self.__db, "first_code_record", code)
                 hasChanged = True
             self.__first_code_record_cache.add(code)
         if hasChanged:
-            RedisUtils.expire(self.__get_redis(), "first_code_record", tool.get_expire())
+            RedisUtils.expire_async(self.__db, "first_code_record", tool.get_expire())
 
     def is_in_first_record(self, code):
         if RedisUtils.sismember(self.__get_redis(), "first_code_record", code):
@@ -171,11 +174,11 @@
         hasChanged = False
         for code in codes:
             if code not in self.__first_code_limited_up_record_cache:
-                RedisUtils.sadd(self.__get_redis(), "first_code_limited_up_record", code)
+                RedisUtils.sadd_async(self.__db, "first_code_limited_up_record", code)
                 hasChanged = True
             self.__first_code_limited_up_record_cache.add(code)
         if hasChanged:
-            RedisUtils.expire(self.__get_redis(), "first_code_limited_up_record", tool.get_expire())
+            RedisUtils.expire_async(self.__db, "first_code_limited_up_record", tool.get_expire())
 
     # 鏄惁娑ㄥ仠杩�
     def is_limited_up(self, code):
@@ -397,11 +400,11 @@
             del_set = old_codes_set - codes_set
             add_codes = codes_set - old_codes_set
             for code in add_codes:
-                RedisUtils.sadd(redis_instance, "gp_list_first", code, auto_free=False)
+                RedisUtils.sadd_async(self.__db, "gp_list_first", code, auto_free=False)
             for code in del_set:
-                RedisUtils.srem(redis_instance, "gp_list_first", code, auto_free=False)
+                RedisUtils.srem_async(self.__db, "gp_list_first", code, auto_free=False)
             if add_codes or del_set:
-                RedisUtils.expire(redis_instance, "gp_list_first", tool.get_expire(), auto_free=False)
+                RedisUtils.expire_async(self.__db, "gp_list_first", tool.get_expire(), auto_free=False)
             # 鏇存柊缂撳瓨
             self.__gp_list_first_codes_cache.clear()
             self.__gp_list_first_codes_cache |= codes_set
@@ -508,12 +511,13 @@
 
 
 def is_in_gp_pool(code):
-    return RedisUtils.sismember(__redisManager.getRedis(), "gp_list", code) or FirstGPCodesManager().is_in_first_gp_codes_cache(code)
+    return RedisUtils.sismember(__redisManager.getRedis(), "gp_list",
+                                code) or FirstGPCodesManager().is_in_first_gp_codes_cache(code)
 
 
 def get_gp_list():
     codes = RedisUtils.smembers(__redisManager.getRedis(), "gp_list")
-    first_codes = FirstGPCodesManager().get_first_gp_codes()
+    first_codes = FirstGPCodesManager().get_first_gp_codes_cache()
     return set.union(codes, first_codes)
 
 
@@ -618,14 +622,12 @@
 
 # datas:[(code,price)]
 def set_prices(datas):
-    pipe = __redisManager.getRedis().pipeline()
     for d in datas:
         code, price = d[0], d[1]
         if code in __current_price_cache and __current_price_cache[code] == price:
             continue
         __current_price_cache[code] = price
-        RedisUtils.setex(pipe, "price-{}".format(code), tool.get_expire(), price)
-    pipe.execute()
+        RedisUtils.setex_async(__db, "price-{}".format(code), tool.get_expire(), price)
 
 
 # 鑾峰彇姝e湪鐩戝惉鐨勪唬鐮�

--
Gitblit v1.8.0