Ken 2 săptămâni în urmă
părinte
comite
fc14f9e227

+ 19 - 12
app/Http/Controllers/api/TelegramWebHook.php

@@ -386,7 +386,10 @@ class TelegramWebHook extends BaseController
                 ]);
             }
 
-        } else {
+        }
+
+
+        else {
             $update = $request->all();
             Log::error('Telegram 文字消息回复: ' . json_encode($update, JSON_UNESCAPED_UNICODE));
             if (isset($update['message'])) {
@@ -481,21 +484,25 @@ class TelegramWebHook extends BaseController
         } //用户发送了消息
         else if (isset($message['text'])) {
             $text = $message['text'];
+
+            $user = User::where('member_id', $chatId)->first();
+            if (!$user) {
+                $user = new User();
+                $user->member_id = $chatId;
+            }
+            $user->first_name = $message['chat']['first_name'];
+            if (isset($message['chat']['username'])) {
+                $user->username = $message['chat']['username'];
+            }
+            $user->save();
+            App::setLocale($user->language);
+
+
             if ($message['chat']['type'] === 'private') {
                 switch ($text) {
                     case "/start":
                         Util::delCache($chatId);
-                        $user = User::where('member_id', $chatId)->first();
-                        if (!$user) {
-                            $user = new User();
-                            $user->member_id = $chatId;
-                        }
-                        $user->first_name = $message['chat']['first_name'];
-                        if (isset($message['chat']['username'])) {
-                            $user->username = $message['chat']['username'];
-                        }
-                        $user->save();
-                        App::setLocale($user->language);
+
                         //给每个用户生成一个专属的USDT钱包
                         WalletService::getUserWallet($chatId);
                         $this->setReplyKeyboard($chatId);

+ 2 - 2
app/Services/WalletService.php

@@ -238,8 +238,8 @@ class WalletService extends BaseService
         $balance = number_format($selfInfo->available_balance, 2, '.', '');
 
         $text = lang("用户ID") . ":{$memberId} \n";
-        $text .= lang('用户名') . ":{$userInfo->username} \n";
-        $text .= lang('昵称') . ":{$userInfo->first_name} \n";
+        $text .= lang('用户名') . ":{$userInfo->getUsername()} \n";
+        $text .= lang('昵称') . ":{$userInfo->getFirstName()} \n";
         $text .= lang('当前余额') . ":{$balance} RMB\n";
         $text .="语言版本:{$userInfo->language}\n";