seven 1 месяц назад
Родитель
Сommit
87860d0673
2 измененных файлов с 13 добавлено и 12 удалено
  1. 9 9
      app/Services/SanJinRechargeService.php
  2. 4 3
      app/Services/WalletService.php

+ 9 - 9
app/Services/SanJinRechargeService.php

@@ -264,11 +264,7 @@ class SanJinRechargeService extends BaseService
     private static function qbApply($chatId, $messageId)
     {
         $three_payment_switch = Config::where('field', 'three_payment_switch')->first()->val;
-        if ($three_payment_switch != 1) {
-            $res = WalletService::getBalance($chatId);
-            $res['message_id'] = $messageId;
-            return $res;
-        }
+        
 
         $text = "请选择支付的通道 \n";
         $keyboard = [];
@@ -276,11 +272,15 @@ class SanJinRechargeService extends BaseService
         $keyboard[] = [
             ['text' => 'USDT', 'callback_data' => "topup@@topup"],
         ];
-        foreach($channel as $k => $v){
-            $keyboard[] = [
-                ['text' => $v, 'callback_data' => "topup_channel@@" .$k]
-            ];
+
+        if ($three_payment_switch == 1) {
+            foreach($channel as $k => $v){
+                $keyboard[] = [
+                    ['text' => $v, 'callback_data' => "topup_channel@@" .$k]
+                ];
+            }
         }
+        
 
         $keyboard[] = [
             ['text' => "返回", 'callback_data' => "topUp@@home"]

+ 4 - 3
app/Services/WalletService.php

@@ -244,7 +244,8 @@ class WalletService extends BaseService
 
         $keyboard = [
             [
-                ['text' => '➕充值', 'callback_data' => "topup@@topup"],
+                // ['text' => '➕充值', 'callback_data' => "topup@@topup"], 
+                ['text' => '➕充值', 'callback_data' => "topup@@sj_apply"], 
                 ['text' => '🧾账单', 'callback_data' => "topup@@bill"],
             ],
             [
@@ -262,8 +263,8 @@ class WalletService extends BaseService
                 ['text' => '🧾 钱宝账单', 'callback_data' => "withdraw@@bank_bill_1"]
             ];
             $keyboard[] = [
-                ['text' => '➕ 三斤充值', 'callback_data' => "topup@@sj_apply"],
-                ['text' => '🧾 三斤账单', 'callback_data' => "topup@@sj_bill_1"]
+                // ['text' => '➕ 三斤充值', 'callback_data' => "topup@@sj_apply"],
+                ['text' => '🧾 第三方充值订单', 'callback_data' => "topup@@sj_bill_1"]
             ];
         }
         $keyboard[] = [