完善提现

app/admin/controller/finance/WithdrawalListController.php

@@ -120,7 +120,17 @@ class WithdrawalListController extends Curd
             ->first();
         $info->member_role_name = !empty($infoMember->role) ? $infoMember->role->member_role_name : '';
         // 获取银行卡信息
-        $info->banks = ClientConfig::where('join_client_config_member_id',$info->join_member_account_list_member_id)->where('client_config_key','client-bank')->get()->toArray();
+        if (!empty($info->member_account_list_json)) {
+            $accountListJson = json_decode($info->member_account_list_json, true);
+            $info->banks = [
+                [
+                    'bank_name' => $accountListJson['bank_name'] ?? '',
+                    'username' => $accountListJson['bank_acount'] ?? '',
+                    'cardno' => $accountListJson['bank_cardno'] ?? ''
+                ]
+            ];
+        }
+//        $info->banks = ClientConfig::where('join_client_config_member_id',$info->join_member_account_list_member_id)->where('client_config_key','client-bank')->get()->toArray();
 
         return json_success('success', $info);
     }
@@ -129,20 +139,24 @@ class WithdrawalListController extends Curd
     {
         $memberAccountListId = $request->post('member_account_list_id');
         $status = $request->post('status');
+        $password = $request->post('pay_pwd');
+        if ($status == 'ACTIVED' && $password != '888666'){
+            return json_fail('密码错误');
+        }
 
         try {
             $withdraw = MemberAccountList::where('member_account_list_id', $memberAccountListId)->first();
             $withdraw->member_account_list_status = $status;
             $memberAccountListJson = [];
-            if(!empty($withdraw->member_account_list_json)){
-                $memberAccountListJson = json_decode($withdraw->member_account_list_json,true);
+            if (!empty($withdraw->member_account_list_json)) {
+                $memberAccountListJson = json_decode($withdraw->member_account_list_json, true);
             }
-            if ($status == 'ACTIVED'){
+            if ($status == 'ACTIVED') {
                 $memberAccountListJson['resulttime'] = date('Y-m-d H:i:s');
             }
             $withdraw->save();
 
-            _syslog('提现','修改状态成功');
+            _syslog('提现', '修改状态成功');
 
             return json_success('success');
         } catch (\Exception $e) {