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

app/Services/BetService.php

@@ -555,14 +555,14 @@ class BetService extends BaseService
 
         $total_amount = BalanceLogService::model()::where('member_id', $memberId)->where('change_type', '中奖')->sum('amount');
         $total_amount = number_format($total_amount, 2);
-        $text = "历史注单 \n";
-        $text .= "中奖总派彩：{$total_amount} \n";
+        $text = lang("历史注单")." \n";
+        $text .= lang("中奖总派彩")."：{$total_amount} \n";
         foreach ($list as $k => $v) {
             if ($v->status == self::model()::STATUS_SETTLED) {
                 $phase = $v->profit - $v->amount;
 
             } else {
-                $phase = '待开奖';
+                $phase = lang('待开奖');
             }
 
             $text .= "-------------------------------------\n";
@@ -575,9 +575,9 @@ class BetService extends BaseService
         $msg['text'] = $text;
 
         $keyboard[] = [
-            ['text' => "全部", 'callback_data' => "betRecordType@@0"],
-            ['text' => "盈利", 'callback_data' => "betRecordType@@1"],
-            ['text' => "亏损", 'callback_data' => "betRecordType@@2"]
+            ['text' => lang("全部"), 'callback_data' => "betRecordType@@0"],
+            ['text' => lang("盈利"), 'callback_data' => "betRecordType@@1"],
+            ['text' => lang("亏损"), 'callback_data' => "betRecordType@@2"]
         ];
 
         if ($page > 1) {

app/Services/PaymentOrderService.php

@@ -222,7 +222,7 @@ class PaymentOrderService extends BaseService
         $data['amount'] = $amount;
         $data['channel'] = $channel;
         $data['fee'] = $amount * $rate;
-        $data['bank_name'] = SanJinService::$CHANNEL[$paymentType]??'';
+        $data['bank_name'] = SanJinService::getChannel($paymentType)??'';
         $order_no = self::createOrderNo('sj' . $data['type'] . '_', $memberId);
         $data['order_no'] = $order_no;
         $data['callback_url'] = SanJinService::getNotifyUrl();

lang/en/messages.php

@@ -232,6 +232,11 @@ return [
     '📋 复制地址' => '📋 Copy Address',
     '✅ 我已付款' => '✅ I have paid',
     "💰钱包余额" => "💰 Wallet Balance",
-
+    "历史注单"=>"Historical Notes",
+    "中奖总派彩"=>"Winning total payout",
+    "待开奖"=>"Pending draw",
+    "全部"=>"all",
+    "盈利"=>"profit",
+    "亏损"=>"loss",
 
 ];

lang/vi/messages.php

@@ -231,7 +231,13 @@ return [
     "- 请耐心等待, 充值成功后 Bot 会通知您!" => "- Vui lòng kiên nhẫn, Bot sẽ thông báo cho bạn khi nạp tiền thành công!",
     '📋 复制地址' => '📋 Sao chép địa chỉ',
     '✅ 我已付款' => '✅ Tôi đã thanh toán',
-    "💰钱包余额" => "💰 Số dư ví"
+    "💰钱包余额" => "💰 Số dư ví",
+    "历史注单"=>"Ghi chú lịch sử",
+    "中奖总派彩"=>"Tổng số tiền thắng",
+    "待开奖"=>"Chờ giải thưởng",
+    "全部"=>"tất cả",
+    "盈利"=>"Lợi nhuận",
+    "亏损"=>"lỗ",
 
 
 ];

lang/zh/messages.php

@@ -232,7 +232,13 @@ return [
     '📋 复制地址' => '📋 复制地址',
     '✅ 我已付款'=>'✅ 我已付款',
     "💰钱包余额"=>"💰钱包余额",
-
+    "历史注单"=>"历史注单",
+    "中奖总派彩"=>"中奖总派彩",
+    "待开奖"=>"待开奖",
+    "全部"=>"全部",
+    "盈利"=>"盈利",
+    "亏损"=>"亏损",
+    
 
 
 ];