Ken 1 week ago
parent
commit
7ed86163e7
2 changed files with 21 additions and 13 deletions
  1. 16 13
      app/Http/Controllers/admin/User.php
  2. 5 0
      lang/zh/messages.php

+ 16 - 13
app/Http/Controllers/admin/User.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Services\RoomService;
 use App\Services\SecretService;
 use App\Services\TopUpService;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -96,19 +97,21 @@ class User extends Controller
             }
             $oldUser = UserModel::where('secret_key', $params['secret_key'])->first();
             $newUser = UserModel::where('member_id', $params['member_id'])->first();
-            $text = "账户转移通知:\n";
-            $text .= "管理员已将您的账户转移至新用户\n\n";
-            $text .= "新用户信息\n";
-            $text .= "用户ID:{$newUser->getMemberId()}\n";
-            $text .= "用户名:{$newUser->getUsername()}\n";
-            $text .= "昵称:{$newUser->getFirstName()}\n";
+            App::setLocale($oldUser->language);
+            $text = lang('账户转移通知') . ":\n";
+            $text .= lang('管理员已将您的账户转移至新用户') . "\n\n";
+            $text .= lang('新用户信息') . "\n";
+            $text .= lang('用户ID') . ":{$newUser->getMemberId()}\n";
+            $text .= lang("用户名") . ":{$newUser->getUsername()}\n";
+            $text .= lang('昵称') . ":{$newUser->getFirstName()}\n";
             TopUpService::notifyTransferSuccess($oldUser->getMemberId(), $text);
-            $text = "账户转移通知:\n";
-            $text .= "管理员已将指定账户转移至您的账户\n\n";
-            $text .= "原账户信息\n\n";
-            $text .= "用户ID:{$oldUser->getMemberId()}\n";
-            $text .= "用户名:{$oldUser->getUsername()}\n";
-            $text .= "昵称:{$oldUser->getFirstName()}\n";
+            App::setLocale($newUser->language);
+            $text = lang("账户转移通知") . ":\n";
+            $text .= lang("管理员已将指定账户转移至您的账户") . "\n\n";
+            $text .= lang('原账户信息') . "\n\n";
+            $text .= lang('用户ID') . ":{$oldUser->getMemberId()}\n";
+            $text .= lang('用户名') . ":{$oldUser->getUsername()}\n";
+            $text .= lang('昵称') . ":{$oldUser->getFirstName()}\n";
             TopUpService::notifyTransferSuccess($newUser->getMemberId(), $text);
             DB::commit();
         } catch (ValidationException $e) {
@@ -116,7 +119,7 @@ class User extends Controller
             return $this->error(HttpStatus::CUSTOM_ERROR, $e->validator->errors()->first());
         } catch (Exception $e) {
             DB::rollBack();
-            if($e->getCode() == HttpStatus::CUSTOM_ERROR){
+            if ($e->getCode() == HttpStatus::CUSTOM_ERROR) {
                 return $this->error(HttpStatus::CUSTOM_ERROR, $e->getMessage());
             }
             return $this->error(intval($e->getCode()));

+ 5 - 0
lang/zh/messages.php

@@ -284,6 +284,11 @@ return [
     "玩法未配置!" => "玩法未配置!",
     "消息格式错误!" => "消息格式错误!",
     "任何疑问都可以联系唯一客服" => "任何疑问都可以联系唯一客服",
+    "账户转移通知" => "账户转移通知",
+    "管理员已将您的账户转移至新用户" => "管理员已将您的账户转移至新用户",
+    "新用户信息" => "新用户信息",
+    "管理员已将指定账户转移至您的账户" => "管理员已将指定账户转移至您的账户",
+    "原账户信息" => "原账户信息",
 
 
 ];