From d82caed022727b80575efb4f894015b5a6bf2e83 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Tue, 8 Apr 2025 17:27:52 +0800
Subject: [PATCH] no message

---
 public/tests/hook.php                        | 2 +-
 src/Controllers/TomApi/Tg/HookController.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/tests/hook.php b/public/tests/hook.php
index 7b148431..b94e01d4 100644
--- a/public/tests/hook.php
+++ b/public/tests/hook.php
@@ -35,7 +35,7 @@ $oHttp->aData = [
             'type' => 'private'
         ],
         'date' => 1610000000,
-        "text" => "\/reportCoupon#3",
+        "text" => "\/reportCoupon#333",
     ]
 ];
 
diff --git a/src/Controllers/TomApi/Tg/HookController.php b/src/Controllers/TomApi/Tg/HookController.php
index 64e0c496..384b9d67 100755
--- a/src/Controllers/TomApi/Tg/HookController.php
+++ b/src/Controllers/TomApi/Tg/HookController.php
@@ -329,6 +329,7 @@ final class HookController
                 $sStartTime = strtotime("-$iDay days");
 
                 $aOrderList = Order::where('update_time', '>=', $sStartTime)
+                        ->whereIn('status', ['activated', 'pending_activation']) // 添加状态条件
                         ->select('coupon',
                                  \App\Services\DB::raw('count(*) as total'),
                                  \App\Services\DB::raw('SUM(price) as total_price'))
@@ -339,7 +340,7 @@ final class HookController
                 $sMsg = '';
                 foreach ($aOrderList as $row) {
                     $sMsg .= "\n\n";
-                    $sMsg .= $row['coupon'] . ':' . $row['total_price'] . ':' . $row['total'];
+                    $sMsg .= $row['coupon'].' - '.$row['total_price'].' / ' . $row['total'];
                 }
 
                 $this->sendMessage($sMsg);
@@ -351,11 +352,12 @@ final class HookController
                 $this->sendMessage($errorMsg);
                 
                 // 返回错误响应
-                Http::response(200, '内部服务器错误');
+                Http::response(500, '内部服务器错误');
             }
         }
 
 
+
         
         // 节点列表（简洁）
         // /nodeList