结算更新

modules/Jiesuan/Http/Controllers/BankAccountController.php

@@ -38,14 +38,18 @@ class BankAccountController extends CatchController
             $data = $request->only(['owner_name', 'name_of_payee', 'card_no',
                 'bank_name', 'sub_bank_name', 'phone_of_payee', 'business_id']);
             $data['updated_at'] = $now;
-            // 只有待审核的允许修改
+            // 只有待审核的允许修改 --放弃
+            // DB::table('bank_cards')
+            //     ->where([
+            //         'id' => $id, 'status' => 1, 'company_uid'=> $company_uid
+            //     ])->update($data);
             DB::table('bank_cards')
                 ->where([
-                    'id' => $id, 'status' => 1, 'company_uid'=> $company_uid
+                    'id' => $id, 'company_uid'=> $company_uid
                 ])->update($data);
         } else {
             $data = $request->all();
-            $data['status'] = 1;
+            $data['status'] = 2; // 免审直接通过
             $data['updated_at'] = $data['created_at'] = $now;
             $data['company_uid'] = $company_uid;
             DB::table('bank_cards')
@@ -116,8 +120,9 @@ class BankAccountController extends CatchController
         return DB::table('bank_cards')
             ->where([
                 'company_uid' => $company_uid,
-                'status' => 2
-            ])->select('id', 'bank_name', 'card_no', 'sub_bank_name')
+                // 'status' => 2
+            ])->where('status','>',0)
+            ->select('id', 'bank_name', 'card_no', 'sub_bank_name')
             ->get();
     }
 

modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -82,7 +82,8 @@ class JiesuanController extends CatchController
             CommonBusinessException::throwError(Errors::TIXIAN_YUE_BUZU);
         }
         $bank_card_id = $request->input('bank_card_id');
-        $bankCard = DB::table('bank_cards')->where(['id' => $bank_card_id, 'status' => 2])->first();
+        // $bankCard = DB::table('bank_cards')->where(['id' => $bank_card_id, 'status' => 2])->first();
+        $bankCard = DB::table('bank_cards')->where(['id' => $bank_card_id])->where('status','>',0)->first();
         if(!$bankCard) {
             CommonBusinessException::throwError(Errors::BANK_CARD_STATUS_ERROR);
         }
@@ -90,6 +91,7 @@ class JiesuanController extends CatchController
             ->insert([
                 'tixian_money' => $tixianMoney,
                 'company_uid' => $company_uid,
+                'company_name' => $bankCard->owner_name,
                 'bank_card_id' => $bank_card_id,
                 'card_no' => $bankCard->card_no,
                 'name_of_payee' => $bankCard->name_of_payee,

modules/Jiesuan/Http/Controllers/VerifyBankInfoController.php

@@ -42,7 +42,7 @@ class VerifyBankInfoController extends CatchController
 
     public function check(VerifyCheckRequest $request)
     {
-
+        $userContext = $this->getUserContext(null);
         $param = [
             'status' => $request->input('status'),
             'checked_user' => [

modules/OrderRefund/Services/RefundOrderService.php

@@ -254,15 +254,16 @@ class RefundOrderService extends BaseServices
         if($info->status == 1){
             self::throwErrMsg("已退款，无需再次操作");
         }
-        if ($info->puser_id >  0){
-            if ($info->pt_verify_status != 1  || $info->sh_verify_status != 1){
-                self::throwErrMsg("双方审核未全部通过，不能退款");
-            }
-        }else{
-            if ($info->pt_verify_status != 1 ){
-                self::throwErrMsg("审核未通过，不能退款");
-            }
-        }
+        // 放弃审核
+        // if ($info->puser_id >  0){
+        //     if ($info->pt_verify_status != 1  || $info->sh_verify_status != 1){
+        //         self::throwErrMsg("双方审核未全部通过，不能退款");
+        //     }
+        // }else{
+        //     if ($info->pt_verify_status != 1 ){
+        //         self::throwErrMsg("审核未通过，不能退款");
+        //     }
+        // }
 
         DB::beginTransaction();
         try {