|
|
@@ -184,7 +184,7 @@ class QianBaoWithdrawService
|
|
|
$list = Bank::where('channel', $channel)->get();
|
|
|
$keyboard = [];
|
|
|
foreach ($list as $item) {
|
|
|
- $keyboard[] = [['text' => $item->alias, 'callback_data' => "withdrawAddress@@choose_qb_{$item->id}"]];
|
|
|
+ $keyboard[] = [['text' => $item->getAlias(), 'callback_data' => "withdrawAddress@@choose_qb_{$item->getId()}"]];
|
|
|
}
|
|
|
$keyboard[] = [
|
|
|
['text' => "{$card}管理", 'callback_data' => "withdraw@@management_{$channel}"],
|
|
|
@@ -338,24 +338,24 @@ class QianBaoWithdrawService
|
|
|
$bankId = Cache::get("{$chatId}_QB_BANK_ID");
|
|
|
$bank = Bank::where('id', $bankId)->first();
|
|
|
$text = "";
|
|
|
- switch ($bank->channel) {
|
|
|
+ switch ($bank->getChannel()) {
|
|
|
case "DF001":
|
|
|
$text = "银行卡提现确认\n";
|
|
|
- $text .= "开户行:{$bank->bank_name}\n";
|
|
|
- $text .= "姓名:{$bank->account}\n";
|
|
|
- $text .= "提现账号:{$bank->card_no}\n";
|
|
|
+ $text .= "开户行:{$bank->getBankName()}\n";
|
|
|
+ $text .= "姓名:{$bank->getAccount()}\n";
|
|
|
+ $text .= "提现账号:{$bank->getCardNo()}\n";
|
|
|
$text .= "提现金额:{$amount}\n";
|
|
|
break;
|
|
|
case "DF002":
|
|
|
$text = "支付宝提现确认\n";
|
|
|
- $text .= "姓名:{$bank->account}\n";
|
|
|
- $text .= "提现账号:{$bank->card_no}\n";
|
|
|
+ $text .= "姓名:{$bank->getAccount()}\n";
|
|
|
+ $text .= "提现账号:{$bank->getCardNo()}\n";
|
|
|
$text .= "提现金额:{$amount}\n";
|
|
|
break;
|
|
|
case "DF005":
|
|
|
$text = "数字人民币提现确认\n";
|
|
|
- $text .= "姓名:{$bank->account}\n";
|
|
|
- $text .= "提现账号:{$bank->card_no}\n";
|
|
|
+ $text .= "姓名:{$bank->getAccount()}\n";
|
|
|
+ $text .= "提现账号:{$bank->getCardNo()}\n";
|
|
|
$text .= "提现金额:{$amount}\n";
|
|
|
break;
|
|
|
}
|
|
|
@@ -380,7 +380,7 @@ class QianBaoWithdrawService
|
|
|
$id = Cache::get("{$chatId}_QB_BANK_ID");
|
|
|
$bank = Bank::where('id', $id)->first();
|
|
|
$amount = Cache::get("{$chatId}_WITHDRAW_QB_MONEY");
|
|
|
- $res = PaymentOrderService::createPayout($chatId, $amount, $bank->channel, $bank->bank_name, $bank->account, $bank->card_no);
|
|
|
+ $res = PaymentOrderService::createPayout($chatId, $amount, $bank->getChannel(), $bank->getBankName(), $bank->getAccount(), $bank->getCardNo());
|
|
|
$res['message_id'] = $messageId;
|
|
|
return $res;
|
|
|
}
|
|
|
@@ -411,7 +411,7 @@ class QianBaoWithdrawService
|
|
|
|
|
|
$keyboard = [];
|
|
|
foreach ($list as $item) {
|
|
|
- $keyboard[] = [['text' => $item->alias, 'callback_data' => "withdrawAddress@@bank_detail{$item->id}"]];
|
|
|
+ $keyboard[] = [['text' => $item->getAlias(), 'callback_data' => "withdrawAddress@@bank_detail{$item->getId()}"]];
|
|
|
}
|
|
|
if (count($list) < 5) {
|
|
|
$keyboard[] = [['text' => "➕ 添加", 'callback_data' => "withdrawAddress@@bank_choose_channel_{$channel}"], ['text' => "↩️返回", 'callback_data' => "topUp@@home"]];
|
|
|
@@ -434,30 +434,30 @@ class QianBaoWithdrawService
|
|
|
|
|
|
$bank = Bank::where('id', $id)
|
|
|
->where('member_id', $chatId)->first();
|
|
|
- switch ($bank->channel) {
|
|
|
+ switch ($bank->getChannel()) {
|
|
|
case "DF001":
|
|
|
$text = "*银行卡管理*\n\n";
|
|
|
- $text .= "姓名:{$bank->account}\n";
|
|
|
- $text .= "银行:{$bank->bank_name}\n";
|
|
|
- $text .= "卡号:{$bank->card_no}\n";
|
|
|
+ $text .= "姓名:{$bank->getAccount()}\n";
|
|
|
+ $text .= "银行:{$bank->getAccount()}\n";
|
|
|
+ $text .= "卡号:{$bank->getCardNo()}\n";
|
|
|
break;
|
|
|
case "DF002":
|
|
|
$text = "*支付宝管理*\n\n";
|
|
|
- $text .= "姓名:{$bank->account}\n";
|
|
|
- $text .= "银行:{$bank->bank_name}\n";
|
|
|
- $text .= "账号:{$bank->card_no}\n";
|
|
|
+ $text .= "姓名:{$bank->getAccount()}\n";
|
|
|
+ $text .= "银行:{$bank->getBankName()}\n";
|
|
|
+ $text .= "账号:{$bank->getCardNo()}\n";
|
|
|
break;
|
|
|
default:
|
|
|
$text = "*银行卡管理*\n\n";
|
|
|
- $text .= "姓名:{$bank->account}\n";
|
|
|
- $text .= "银行:{$bank->bank_name}\n";
|
|
|
- $text .= "卡号:{$bank->card_no}\n";
|
|
|
+ $text .= "姓名:{$bank->getAccount()}\n";
|
|
|
+ $text .= "银行:{$bank->getBankName()}\n";
|
|
|
+ $text .= "卡号:{$bank->getCardNo()}\n";
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
|
|
|
$keyboard = [
|
|
|
- [['text' => '❌删除', 'callback_data' => "withdraw@@bank_del_{$id}"], ['text' => '↩️返回列表', 'callback_data' => "withdraw@@management_{$bank->channel}"]],
|
|
|
+ [['text' => '❌删除', 'callback_data' => "withdraw@@bank_del_{$id}"], ['text' => '↩️返回列表', 'callback_data' => "withdraw@@management_{$bank->getChannel()}"]],
|
|
|
];
|
|
|
return [
|
|
|
'chat_id' => $chatId,
|
|
|
@@ -593,7 +593,7 @@ class QianBaoWithdrawService
|
|
|
];
|
|
|
}
|
|
|
|
|
|
- private static function inputAliAs($chatId, $alias, $messageId):array
|
|
|
+ private static function inputAliAs($chatId, $alias, $messageId): array
|
|
|
{
|
|
|
$channel = Cache::get("{$chatId}_QB_WITHDRAW_CHANNEL");
|
|
|
$cardNo = Cache::get("{$chatId}_QB_WITHDRAW_CARD_NO");
|