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

app/Services/QianBaoWithdrawService.php

@@ -248,7 +248,7 @@ class QianBaoWithdrawService
         if (!$amount) return WalletService::getBalance($chatId);
 
         $bank = Bank::where('id', $id)->first();
-//        PaymentOrderService::createPayout($chatId, $amount, $bank->channel, $bank->bank_name, $bank->account, $bank->card_no);
+        PaymentOrderService::createPayout($chatId, $amount, $bank->channel, $bank->bank_name, $bank->account, $bank->card_no);
         $text = "提交成功\n";
         $text .= "结果将在稍后通知您，请留意通知！！！";
         return [
@@ -273,7 +273,7 @@ class QianBaoWithdrawService
         if (count($list) < 5) {
             $keyboard[] = [['text' => "➕ 添加银行卡", 'callback_data' => "withdrawAddress@@bank_add"]];
         }
-        $keyboard[] = [['text' => "↩️返回", 'callback_data' => "withdraw@@home"]];
+        $keyboard[] = [['text' => "↩️返回", 'callback_data' => "withdraw@@banks"]];
         return [
             'chat_id' => $chatId,
             'text' => $text,
@@ -307,7 +307,8 @@ class QianBaoWithdrawService
                 break;
             case "DF002":
                 $text .= "姓名：{$bank->account}\n";
-                $text .= "支付宝账号：{$bank->card_no}\n";
+                $text .= "银行：{$bank->bank_name}\n";
+                $text .= "账号：{$bank->card_no}\n";
                 break;
             default:
                 $text .= "姓名：{$bank->account}\n";
@@ -398,6 +399,16 @@ class QianBaoWithdrawService
 
     static function inputCardNo($chatId, $cardNo, $messageId)
     {
+        $channel = Cache::get("{$chatId}_QB_WITHDRAW_CHANNEL");
+        if ($channel === 'DF001' && !preg_match('/^\d+$/', $cardNo)) {
+            return [
+                'chat_id' => $chatId,
+                'text' => "输入的银行卡号有误，请重新输入",
+                'reply_to_message_id' => $messageId,
+            ];
+        }
+
+
         Cache::put("{$chatId}_QB_WITHDRAW_CARD_NO", $cardNo);
         Cache::put(get_step_key($chatId), StepStatus::QB_INPUT_ACCOUNT);