Ken 2 weeks ago
parent
commit
dba11c51b0
3 changed files with 82 additions and 35 deletions
  1. 48 1
      app/Models/Bank.php
  2. 23 23
      app/Services/QianBaoWithdrawService.php
  3. 11 11
      app/Services/SanJinRechargeService.php

+ 48 - 1
app/Models/Bank.php

@@ -6,21 +6,68 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
+
 /**
  * Admin
  * @mixin Builder
  * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
+ * @property $id
+ * @property $member_id
+ * @property $channel
+ * @property $bank_name
+ * @property $account
+ * @property $card_no
+ * @property $alias
+ *
  */
 class Bank extends Authenticatable
 {
     use HasApiTokens, Notifiable;
+
     protected $table = 'banks';
     protected $hidden = ['created_at', 'updated_at'];
-    protected $fillable = ['member_id', 'channel', 'bank_name', 'account', 'card_no','alias'];
+    protected $fillable = ['member_id', 'channel', 'bank_name', 'account', 'card_no', 'alias'];
+
+    public function getId()
+    {
+        return $this->id;
+    }
 
+    public function setMemberId($memberId): void
+    {
+        $this->member_id = $memberId;
+    }
 
+    public function getMemberId(): int
+    {
+        return $this->member_id;
+    }
 
+    public function getChannel(): string
+    {
+        return $this->channel;
+    }
 
+    public function getBankName(): string
+    {
+        return $this->bank_name;
+    }
+
+    public function getAccount(): string
+    {
+        return $this->account;
+
+    }
+
+    public function getAlias(): string
+    {
+        return $this->alias;
+    }
+
+    public function getCardNo(): string
+    {
+        return $this->card_no;
+    }
 
 
     protected function getCreatedAtAttribute($value)

+ 23 - 23
app/Services/QianBaoWithdrawService.php

@@ -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");

+ 11 - 11
app/Services/SanJinRechargeService.php

@@ -354,7 +354,7 @@ class SanJinRechargeService extends BaseService
         if (!$amount) return WalletService::getBalance($chatId);
 
         $bank = Bank::where('id', $id)->first();
-        $result = PaymentOrderService::createPayout($chatId, $amount, $bank->channel, $bank->bank_name, $bank->account, $bank->card_no);
+        $result = PaymentOrderService::createPayout($chatId, $amount, $bank->getChannel(), $bank->getBankName(), $bank->getAccount(), $bank->getCardNo());
         return $result;
         // $text = "提交成功\n";
         // $text .= "结果将在稍后通知您,请留意通知!!!";
@@ -397,21 +397,21 @@ class SanJinRechargeService extends BaseService
         $bank = Bank::where('id', $id)
             ->where('member_id', $chatId)->first();
 
-        switch ($bank->channel) {
+        switch ($bank->getChannel()) {
             case "DF001":
-                $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;
             case "DF002":
-                $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 .= "姓名:{$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;
         }