Merge branch 'master' of 47.76.126.2:seven/bot-28

app/Services/SanJinRechargeService.php

@@ -162,48 +162,48 @@ class SanJinRechargeService extends BaseService
             ->count();
 
 
-        $text = "👤 {$firstName}({$chatId})    第三方订单记录\n\n";
+        $text = "👤 {$firstName}({$chatId})    ".lang('第三方订单记录')."\n\n";
         foreach ($list as $item) {
             $amount = floatval($item->amount);
 
             $amount = $item->type == 2 ? "➖ {$amount}" : "➕ $amount";
             $text .= "-------------------------------------\n";
-            $text .= "订单类型：".($item->type == 1?"充值":"提现")." \n";
-            $text .= "订单金额：{$amount} \n";
-            $text .= "订单号：{$item->order_no}\n";
+            $text .= lang('订单类型')."：".($item->type == 1?lang("充值"):lang("提现"))." \n";
+            $text .= lang('订单金额')."：{$amount} \n";
+            $text .= lang('订单号')."：{$item->order_no}\n";
             if($item->type == 2){
-                $text .= "银行：{$item->bank_name}\n";
-                $text .= "姓名：{$item->account}\n";
-                $text .= "卡号：{$item->card_no}\n";
+                $text .= lang("银行")."：{$item->bank_name}\n";
+                $text .= lang("姓名")."：{$item->account}\n";
+                $text .= lang('卡号')."：{$item->card_no}\n";
             }else{
-                $text .= "充值类型：{$item->bank_name}\n";
+                $text .= lang("充值类型")."：".lang($item->bank_name)."\n";
             }
           
-            $status = ['待处理', '处理中', '成功', '失败'];
-            $text .= "状态：{$status[$item->status]}\n";
+            $status = [lang('待处理'), lang('处理中'), lang('成功'), lang('失败')];
+            $text .= lang('状态')."：{$status[$item->status]}\n";
             if ($item->remark) {
-                $text .= "说明：{$item->remark}\n";
+                $text .= lang('说明')."：{$item->remark}\n";
             }
-            $text .= "日期：{$item->created_at}\n";
+            $text .= lang('日期')."：{$item->created_at}\n";
         }
 
         if ($page > 1) {
             $keyboard[] = [
-                ['text' => "👆上一页", 'callback_data' => "topup@@sj_bill_" . ($page - 1)]
+                ['text' => lang("👆上一页"), 'callback_data' => "topup@@sj_bill_" . ($page - 1)]
             ];
         }
         $allPage = ceil($count / $limit);
         if ($allPage > $page) {
             if ($page > 1) {
-                $keyboard[count($keyboard) - 1][] = ['text' => "👇下一页", 'callback_data' => "topup@@sj_bill_" . ($page + 1)];
+                $keyboard[count($keyboard) - 1][] = ['text' => lang("👇下一页"), 'callback_data' => "topup@@sj_bill_" . ($page + 1)];
             } else {
                 $keyboard[] = [
-                    ['text' => "👇下一页", 'callback_data' => "topup@@sj_bill_" . ($page + 1)]
+                    ['text' => lang("👇下一页"), 'callback_data' => "topup@@sj_bill_" . ($page + 1)]
                 ];
             }
         }
         $keyboard[] = [
-            ['text' => "返回", 'callback_data' => "topUp@@home"]
+            ['text' => lang("↩️返回"), 'callback_data' => "topUp@@home"]
         ];
         return [
             'chat_id' => $chatId,

lang/en/messages.php

@@ -146,6 +146,12 @@ return [
     "请输入充值的金额" => "Please enter the recharge amount",
     "🔔 提示：请选择下方充值的金额" => "🔔 Tip: Please select the recharge amount below",
     "🔔 提示：请务必核对（充值最大金额和最小金额，账号信息一致），若不一致无法到账。" => "🔔 Tip: Please ensure that (the maximum and minimum recharge amounts, and account information are consistent), if not, the funds will not be credited.",
+    "第三方订单记录" => "Third-Party Order Records",
+    "订单类型" => "Order Type",
+    "充值" => "Recharge",
+    "提现" => "Withdraw",
+    "订单金额" => "Order Amount",
+    "充值类型" => "Recharge Type",
 
 
 

lang/vi/messages.php

@@ -146,6 +146,12 @@ return [
     "请输入充值的金额" => "Vui lòng nhập số tiền nạp",
     "🔔 提示：请选择下方充值的金额" => "🔔 Lưu ý: Vui lòng chọn số tiền nạp dưới đây",
     "🔔 提示：请务必核对（充值最大金额和最小金额，账号信息一致），若不一致无法到账。" => "🔔 Lưu ý: Vui lòng kiểm tra kỹ (số tiền nạp tối đa và tối thiểu, thông tin tài khoản chính xác), nếu không khớp sẽ không thể chuyển tiền vào tài khoản.",
+    "第三方订单记录" => "Lịch sử đơn hàng bên thứ ba",
+    "订单类型" => "Loại đơn hàng",
+    "充值" => "Nạp tiền",
+    "提现" => "Rút tiền",
+    "订单金额" => "Số tiền đơn hàng",
+    "充值类型" => "Loại nạp tiền",
 
 
 

lang/zh/messages.php

@@ -143,8 +143,15 @@ return [
     "金额输入不正确，请发送预充值数字" => "金额输入不正确，请发送预充值数字",
     "💳️ 银行卡管理" => "💳️ 银行卡管理",
     "充值金额" => "充值金额",
-    "请输入充值的金额"=>"请输入充值的金额",
-    "🔔 提示：请选择下方充值的金额"=>"🔔 提示：请选择下方充值的金额",
-    "🔔 提示：请务必核对（充值最大金额和最小金额，账号信息一致），若不一致无法到账。"=>"🔔 提示：请务必核对（充值最大金额和最小金额，账号信息一致），若不一致无法到账。",
+    "请输入充值的金额" => "请输入充值的金额",
+    "🔔 提示：请选择下方充值的金额" => "🔔 提示：请选择下方充值的金额",
+    "🔔 提示：请务必核对（充值最大金额和最小金额，账号信息一致），若不一致无法到账。" => "🔔 提示：请务必核对（充值最大金额和最小金额，账号信息一致），若不一致无法到账。",
+    "第三方订单记录" => "第三方订单记录",
+    "订单类型"=>"订单类型",
+    "充值"=>"充值",
+    "提现"=>"提现",
+    "订单金额"=>"订单金额",
+    "充值类型"=>"充值类型"
+
 
 ];