From 4e4306d4464ac7aa6bff045403f25968ae77e1c3 Mon Sep 17 00:00:00 2001
From: liuwei <liuwei@wdtrgf.com.cn>
Date: Thu, 10 Apr 2025 10:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8A=AB=E4=BF=9D?=
 =?UTF-8?q?=E9=87=8A=E5=8A=9F=E8=83=BD=20-=20=E6=89=93=E5=8A=AB=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=90=8E=E8=87=AA=E5=8A=A8=E5=85=B3=E6=8A=BC24?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=20-=20=E5=85=B6=E4=BB=96=E4=BA=BA=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BD=BF=E7=94=A8"=E4=BF=9D=E9=87=8A=20@=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7"=E5=91=BD=E4=BB=A4=E8=8A=B1=E8=B4=B930=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E4=BF=9D=E9=87=8A=20-=20=E5=9C=A8=E6=8A=BC=E6=9C=9F?=
 =?UTF-8?q?=E9=97=B4=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8A=AB?=
 =?UTF-8?q?=20-=20=E4=BF=9D=E9=87=8A=E5=90=8E=E7=AB=8B=E5=8D=B3=E9=87=8A?=
 =?UTF-8?q?=E6=94=BE=20-=20=E6=89=80=E6=9C=89=E8=AE=B0=E5=BD=95=E9=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E4=BF=9D=E5=AD=98=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/point_trade/main.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/point_trade/main.py b/plugins/point_trade/main.py
index 0e20140..095e9b3 100644
--- a/plugins/point_trade/main.py
+++ b/plugins/point_trade/main.py
@@ -443,6 +443,15 @@ class PointTradePlugin(MessagePluginInterface):
         if not roomid:
             wcf.send_text("❌打劫功能仅在群聊中可用！", sender, "")
             return True, "非群聊环境"
+            
+        # 检查是否在押
+        prison_status = self.points_db.check_prison_status(sender, roomid)
+        if prison_status:
+            remaining_time = prison_status['end_time'] - datetime.now()
+            hours = int(remaining_time.total_seconds() / 3600)
+            minutes = int((remaining_time.total_seconds() % 3600) / 60)
+            wcf.send_text(f"❌你正在服刑！\n剩余时间: {hours}小时{minutes}分钟\n可请求他人花费30积分保释。", roomid, sender)
+            return True, "在押状态"
 
         # 检查冷却时间
         current_time = time.time()
@@ -555,14 +564,6 @@ class PointTradePlugin(MessagePluginInterface):
                     wcf.send_text(f"❌打劫过程中出现问题：{result.get('error', '未知错误')}", roomid, sender)
                     return True, "打劫失败"
             else:
-                # 检查是否在押
-                prison_status = self.points_db.check_prison_status(sender, roomid)
-                if prison_status:
-                    remaining_time = prison_status['end_time'] - datetime.now()
-                    hours = int(remaining_time.total_seconds() / 3600)
-                    minutes = int((remaining_time.total_seconds() % 3600) / 60)
-                    wcf.send_text(f"❌你正在服刑！\n剩余时间: {hours}小时{minutes}分钟\n可请求他人花费30积分保释。", roomid, sender)
-                    return True, "在押状态"
 
                 # 打劫失败处理
                 penalty_amount = int(robber_total * self.rob_penalty_percent)