From 299e22ebb849e6152010d9b9b50c88c2d2358bab Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 5 Dec 2023 09:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=8F=AA=E8=83=BD=E5=9C=A8?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=97=B6=E9=97=B4=E5=86=85=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=93=8D=E4=BD=9C(=E5=B7=B2=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../withdraw/controllers/DetailController.php     | 15 +++++++++++++++
 .../finance/withdraw/withdraw-income.blade.php    |  4 ++--
 resources/views/withdraw/detail.blade.php         |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/backend/modules/withdraw/controllers/DetailController.php b/app/backend/modules/withdraw/controllers/DetailController.php
index 185eafb5..16200355 100644
--- a/app/backend/modules/withdraw/controllers/DetailController.php
+++ b/app/backend/modules/withdraw/controllers/DetailController.php
@@ -122,6 +122,21 @@ class DetailController extends BaseController
 
             $this->withdrawModel->actual_amounts = bcsub(bcsub($this->withdrawModel->amounts, $this->withdrawModel->poundage, 2), $this->withdrawModel->servicetax, 2);
         }
+        // 判断：当前时间是否可以进行审核
+        $incomeSet = \Setting::get('withdraw.income');
+        $withdraw_date_time_start = (int)$incomeSet['withdraw_date_time_start'];
+        $withdraw_date_time_end = (int)$incomeSet['withdraw_date_time_end'];
+        $startTime = strtotime(date("Y-m-d {$withdraw_date_time_start}:00:00"));
+        $startEnd = strtotime(date("Y-m-d {$withdraw_date_time_end}:00:00"));
+        $isAllowExamine = true;// 默认允许审核
+        if($withdraw_date_time_start > 0 && $withdraw_date_time_end > 0){
+            $isAllowExamine = ($startTime < time() && $startEnd > time());
+        }else if($withdraw_date_time_start > 0 && $withdraw_date_time_end == 0){
+            $isAllowExamine = $startTime < time();
+        }else if($withdraw_date_time_start == 0 && $withdraw_date_time_end > 0){
+            $isAllowExamine = $startEnd > time();
+        }
+        $result_data['is_allow_examine'] = $isAllowExamine;
 
         return $result_data;
     }
diff --git a/resources/views/finance/withdraw/withdraw-income.blade.php b/resources/views/finance/withdraw/withdraw-income.blade.php
index 5914c3c2..b96bbaac 100644
--- a/resources/views/finance/withdraw/withdraw-income.blade.php
+++ b/resources/views/finance/withdraw/withdraw-income.blade.php
@@ -679,7 +679,7 @@
 
 <div class="tab-pane  active">
     <div class="form-group">
-        <label class="col-xs-12 col-sm-3 col-md-2 control-label">可提现时间</label>
+        <label class="col-xs-12 col-sm-3 col-md-2 control-label">提现审核时间</label>
         <div class="col-sm-10 col-xs-12">
             <div class="input-group" style="width: 40%!important;">
                 <input type="text" name="withdraw[income][withdraw_date_time_start]" class="form-control" value="{{ $set['withdraw_date_time_start'] ?? ''}}" placeholder="请输入可提现开始时间"/>
@@ -687,7 +687,7 @@
                 <input type="text" name="withdraw[income][withdraw_date_time_end]" class="form-control" value="{{ $set['withdraw_date_time_end'] ?? ''}}" placeholder="请输入可提现结束时间"/>
                 <div class="input-group-addon">时</div>
             </div>
-            <span class='help-block'>当前可提现时间，例如：9至17，则代表只能在9时0分0秒至17时0分0秒(下午5时0分0秒)进行提现申请。为空则默认为当天0时0分0秒至23时59分59秒可以提现</span>
+            <span class='help-block'>提现审核时间，例如：9至17，则代表只能在9时0分0秒至17时0分0秒(下午5时0分0秒)进行提现审核。为空或者0则不限制时间</span>
         </div>
     </div>
 </div>
diff --git a/resources/views/withdraw/detail.blade.php b/resources/views/withdraw/detail.blade.php
index 3fa82560..4866868e 100644
--- a/resources/views/withdraw/detail.blade.php
+++ b/resources/views/withdraw/detail.blade.php
@@ -225,6 +225,7 @@
         <div style="height: 60px;"></div>
         <div class="vue-page">
             <el-button @click="goback">返回列表</el-button>
+            @if($is_allow_examine == 1)
             <el-button type="primary" @click="examine('审核成功')" v-if="withdraw.status==0">提交审核</el-button>
             <template v-if="withdraw.status==1">
                 <el-button v-if="withdraw.pay_way=='consol_withdraw_bank'" type="primary" @click="Repayment('pay_way')">汇聚代发薪-银行卡</el-button>
@@ -257,6 +258,7 @@
             <template v-else-if="withdraw.status==-1">
                 <el-button type="primary" @click="examine('重新审核成功')">重新审核</el-button>
             </template>
+            @endif
         </div>
 
         <el-dialog title="详情" :visible.sync="dialogVisible" width="30%">