Merge branch 'wangzq-yy' into test

modules/Callback/Http/Controllers/JuliangAccountController.php

@@ -19,7 +19,10 @@ class JuliangAccountController extends CatchController
         $advAccountId = $request->input('account_id');
         $advAccountName = $request->input('account_name');
         $unBind = $request->input('unbind', 0);
+        $id =  $request->input('id', 0);
         $alreadyBindConfigIds = null;
+        $promotionId = $request->input('promotion_id',0);
+
         if($unBind) {
             $alreadyBindConfigIds = DB::table('promotions')
                 ->where([
@@ -32,6 +35,24 @@ class JuliangAccountController extends CatchController
                 ->select('callback_config_id')
                 ->get()->pluck('callback_config_id')->toArray();
         }
+        $configIds = null;
+        if ($promotionId){
+            $configIds =  DB::table('promotions')
+                ->where([
+                    'uid' => $this->getOptimizerUid(),
+                    'id' =>  $promotionId,
+                    'callback_type' => 1,
+                    'status' => 1,
+                    'is_enabled' => 1,
+                ])->where('callback_config_id' , '<>', 0)
+                ->distinct()
+                ->select('callback_config_id')
+                ->get()->pluck('callback_config_id')->toArray();
+                // 没有数据
+                if (empty($configIds)){
+                    return   DB::table('juliang_account_callback_config')->where('id','<','0')->paginate($request->input('limit', 30));
+                }
+        }
 
         $list =  DB::table('juliang_account_callback_config')
             ->where(['company_uid' => $this->getOptimizerUid()])
@@ -41,6 +62,10 @@ class JuliangAccountController extends CatchController
                 return $query->where('adv_account_name', 'like', '%'. $advAccountName. '%');
             })->when($alreadyBindConfigIds, function ($query, $alreadyBindConfigIds) {
                 return $query->whereNotIn('id', $alreadyBindConfigIds);
+            })->when($id,function ($query, $id) {
+                return $query->where('id', $id);
+            })->when($configIds,function ($query,  $configIds) {
+                return $query->whereIn('id',$configIds );
             })
             ->orderBy('id', 'desc')
             ->paginate($request->input('limit', 30));
@@ -65,7 +90,7 @@ class JuliangAccountController extends CatchController
     public function addAccount(Request $request) {
         $this->validate($request, [
             'account_id' => 'required',
-            'account_name' => 'required|string|max:64',
+            // 'account_name' => 'required|string|max:64',
             'state' => 'required|integer|in:0,1',
             'protect_num' => 'required|integer|min:0',
             'default_rate' => 'required|min:0|max:100',
@@ -84,20 +109,24 @@ class JuliangAccountController extends CatchController
             CommonBusinessException::throwError(Errors::CALLBACK_RATE_TIME_RANGE_ERROR);
         }
         $now = date('Y-m-d H:i:s');
+        $param = [
+            'adv_account_id' => $request->input('account_id'),
+            'adv_account_name' => $request->input('account_name',''),
+            'state' => $request->input('state'),
+            'protect_num' => $request->input('protect_num'),
+            'default_rate' => $request->input('default_rate'),
+            'rate_time_config' => \json_encode($request->input('rate_time_config', [])),
+            'min_money' => $request->input('min_money'),
+            'max_money' => $request->input('max_money'),
+            'company_uid' => $this->getOptimizerUid(),
+            'created_at' => $now,
+            'updated_at' => $now,
+        ];
+        if (empty($param['adv_account_name'])){
+            unset($param['adv_account_name']);
+        }
         DB::table('juliang_account_callback_config')
-            ->insert([
-                'adv_account_id' => $request->input('account_id'),
-                'adv_account_name' => $request->input('account_name'),
-                'state' => $request->input('state'),
-                'protect_num' => $request->input('protect_num'),
-                'default_rate' => $request->input('default_rate'),
-                'rate_time_config' => \json_encode($request->input('rate_time_config', [])),
-                'min_money' => $request->input('min_money'),
-                'max_money' => $request->input('max_money'),
-                'company_uid' => $this->getOptimizerUid(),
-                'created_at' => $now,
-                'updated_at' => $now,
-            ]);
+            ->insert($param);
         DB::table('juliang_account_rate_config_log')
             ->insert([
                 'company_uid' => $this->getOptimizerUid(),

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

@@ -269,15 +269,18 @@ 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 {