From b61c0926bd3133fd65f4a41b4913366fe4b07baf Mon Sep 17 00:00:00 2001
From: Administrator <fdefewf@vrfdgesgf>
Date: Thu, 18 Dec 2025 16:42:26 +0800
Subject: [PATCH] =?UTF-8?q?bitmart=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 telegram/8619211027341.session | Bin 45056 -> 45056 bytes
 telegram/bot_session.session   | Bin 40960 -> 40960 bytes
 telegram/gpt1.py               |   6 +--
 telegram/sign.db               | Bin 40960 -> 40960 bytes
 交易/weex-结构优化.py          |  72 ++++++++++++++++++++-------------
 5 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session
index deddd3a095cc1ea479f23531ce151bbfc548fb04..6e3682ac36f10acbb22c59c4befb247d4e9c3ce9 100644
GIT binary patch
delta 64
zcmV-G0Kfl$-~xc)0+1U4T9F(>0a~$OrELkgLE2F7mxZgJlMZep0=`<aGj7NP0=`|d
W{c@540={0ek#r(E0=`|7wXaKP;Twto

delta 64
zcmV-G0Kfl$-~xc)0+1U49FZJD0UWVlrELkBLE2E~E7EcilMZep0-UR}Gj7NP0-Ub1
W{c@540-Ue2k#r(E0-UaswXaJvm>RtR

diff --git a/telegram/bot_session.session b/telegram/bot_session.session
index 78e93325228156003de277556bbf261f32b31ad1..d3e81a1dbbfd932295f12eead1be1e5c327bb204 100644
GIT binary patch
delta 135
zcmZoTz|?SnX@WH4w23m#jMFwIDCbMPbi5VtzQ14XpCAJp10xFylf3rCI~y{c_g<Ym
zH{X|YJ4|}>=lrL9O#AF68`v67=C0q#wD-p3WAzqH+b?fwU}0u<UOs6ud$Sg^^R{oB
kO_~?5GHt)K`C3Pe08oDN+&;a{Ni(IHfm$}#&uL@^0O;X56aWAK

delta 135
zcmZoTz|?SnX@WE($3z)tMvjdM%K1|F9B&0Ych)|ZD9FIZz{tYFB(FX3&W23qIcp}*
z&G+S;36tLZIsYji(_Eg(2DXNix$Ac_%~?13SiJ?)jKob1EX>SK?ms58H)}CFeA&3!
jq<H}=Q=Ho7YaKBHK>5jY`}8&^&6H*aYS~;rr;!-|NBT4d

diff --git a/telegram/gpt1.py b/telegram/gpt1.py
index 6cbd005..03dc0ae 100644
--- a/telegram/gpt1.py
+++ b/telegram/gpt1.py
@@ -536,7 +536,7 @@ async def build_sign_message(user_id: int, username: str) -> str:
     return (
         f"✅ @{username} check-in succeed! Earned {SIGN_POINTS} points.\n"
         f"Current total points: {total}\n\n"
-        f"100 points can be exchanged for a 5 USDT experience gold."
+        f"100 points can be exchanged for a 5 (USDT) $ trial bonus."
     )
 
 
@@ -565,7 +565,7 @@ async def build_points_message(user_id: int, username: str) -> str:
         f"💰 @{username} Points Overview\n\n"
         f"📊 Current points: {total_pts}\n"
         f"👥 Invited users: {invite_count}\n\n"
-        f"💡 100 points can be exchanged for a 5 USDT experience gold."
+        f"💡 100 points can be exchanged for a 5 (USDT) $ trial bonus."
     )
 
 
@@ -575,7 +575,7 @@ def get_command_list_text() -> str:
         info = COMMAND_DEFINITIONS[key]
         msg += f"`{info['display']}` → {info['description']}\n"
     msg += (
-        f"\nSign-in Reward: {SIGN_POINTS} points each time, and 100 points can be redeemed for a 5 USDT experience gold.\n"
+        f"\nSign-in Reward: {SIGN_POINTS} points each time, and 100 points can be exchanged for a 5 (USDT) $ trial bonus.\n"
         f"Chat Reward: The top {DAILY_SPEAK_TOP_N} users in daily chat activity each receive {DAILY_SPEAK_REWARD} points.\n"
         f"Invitation Reward: Each invited user grants {INVITE_POINTS} points.\n"
         f"Daily Settlement Time: Every day at 12:00 PM (America/New_York timezone)."
diff --git a/telegram/sign.db b/telegram/sign.db
index 22d2472e909ab1bf20f555ee8e5b5224fdb00000..4bdf463a0196a486a1304b51beb80e3b9400f44b 100644
GIT binary patch
delta 320
zcmZoTz|?SnX@WGP!9*EnMuUwB+LGKFMg~Tvx`sx&h8B~jNvd&+Ao!b)OR}+X2OtC{
z-;mc~7U1ie%&wro+QqkxFK)A;fi&M_cRgn@5os1yMNS6B;;Wxi5jr+6&`V+D65#7+
z;GfF3o3DQ|kAd7~K?ifb$;oy)VxmATjObdVCttJ^*}T)v&5<!|Qv-{D5<ky+2L7}B
zv-s2b)%c$BE#WKVv*Y9DJ;mF}>%l9^^N45tW<!Ne9wx)E$>;OMWk5a&F)+3=G_f)?
z(6cZ#H83;OH88a@Ffa_Ae15)^Bv=-xz{pb1+}PaI!UQTCGI`E?DRH2zk(Ggom8pTA
RrJ<pzr7=Wyv&Y;WOaMt=Qf2@E

delta 221
zcmZoTz|?SnX@WGP=0q81M$L^0+LGLIMg~Tvx`sx&hUSx}Nvd&k!TDyJk4v(#al63<
z%qQQF*J0-8TQHejL4kD}-!{Iu&4vcje3RYvoW=NlFz6_9GBB>&>ZAhKVYYdJUJ4@z
zKi^UY{;7PsC-WJ|G4WsBEa+g)H#yl(M~q*XL5C4tkLcu!b|Ra1+POJ025)L$5s=~G
q^<dyX%Rh@honMXbDc=&lLOwe_Zr)S8oxC2K4HYzaH+#(8!2|##eK_O*

diff --git a/交易/weex-结构优化.py b/交易/weex-结构优化.py
index 9783368..40e73f5 100644
--- a/交易/weex-结构优化.py
+++ b/交易/weex-结构优化.py
@@ -399,8 +399,14 @@ class TradingExecutor:
             amount: 交易金额
 
         Returns:
-            是否成功
+            是否成功（如果已持有相同方向仓位，返回True但不执行操作）
         """
+        # 检查是否已经持有相同方向的仓位
+        if (direction == "long" and current_position == PositionManager.POSITION_LONG) or \
+           (direction == "short" and current_position == PositionManager.POSITION_SHORT):
+            logger.info(f"已持有{direction}方向仓位，无需重复开仓")
+            return True  # 返回True表示"状态正常"，虽然没有执行交易
+
         if not self.navigate_to_trading_page():
             return False
 
@@ -781,38 +787,48 @@ class WeexTransaction:
         )
 
         if direction:
-            # 获取可用余额
-            balance = self.api_client.get_available_balance()
-            if balance is None:
-                logger.error("获取可用余额失败")
-                MessageSender.send_dingtalk_message("获取可用余额失败", is_error=True)
-                return
+            # 检查是否已经持有相同方向的仓位
+            current_pos = self.position_manager.current_position
+            if (direction == "long" and current_pos == PositionManager.POSITION_LONG) or \
+               (direction == "short" and current_pos == PositionManager.POSITION_SHORT):
+                logger.info(f"已持有{direction}方向仓位，继续持仓，不执行新开仓操作")
+                # 继续持仓，不发送开仓信息，直接返回继续执行后续的持仓信息发送
+            else:
+                # 需要执行交易（新开仓或反手）
+                # 获取可用余额
+                balance = self.api_client.get_available_balance()
+                if balance is None:
+                    logger.error("获取可用余额失败")
+                    MessageSender.send_dingtalk_message("获取可用余额失败", is_error=True)
+                    return
 
-            amount = balance / Config.POSITION_RATIO
+                amount = balance / Config.POSITION_RATIO
 
-            # 执行交易
-            if not self.trading_executor.execute_trade(
-                direction=direction,
-                current_position=self.position_manager.current_position,
-                amount=amount
-            ):
-                MessageSender.send_dingtalk_message(
-                    f"交易执行失败，方向：{direction}",
-                    is_error=True
+                # 执行交易
+                trade_executed = self.trading_executor.execute_trade(
+                    direction=direction,
+                    current_position=self.position_manager.current_position,
+                    amount=amount
                 )
-                return
 
-            # 更新持仓状态
-            if direction == "long":
-                self.position_manager.current_position = PositionManager.POSITION_LONG
-            elif direction == "short":
-                self.position_manager.current_position = PositionManager.POSITION_SHORT
+                if not trade_executed:
+                    MessageSender.send_dingtalk_message(
+                        f"交易执行失败，方向：{direction}",
+                        is_error=True
+                    )
+                    return
 
-            # 发送交易消息
-            MessageSender.send_dingtalk_message(
-                f"信号：{direction}，开仓金额：{amount:.2f}",
-                is_error=False
-            )
+                # 更新持仓状态
+                if direction == "long":
+                    self.position_manager.current_position = PositionManager.POSITION_LONG
+                elif direction == "short":
+                    self.position_manager.current_position = PositionManager.POSITION_SHORT
+
+                # 发送交易消息（只有真正执行了开仓或反手操作才发送）
+                MessageSender.send_dingtalk_message(
+                    f"信号：{direction}，开仓金额：{amount:.2f}",
+                    is_error=False
+                )
 
         # 再次同步持仓状态（交易后）
         if not self.sync_position_status():