From e24550b993d2abb7a6f30e1f24800a32beb3a4c4 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 21 Nov 2019 22:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B1=87=E6=80=BB--bug=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/FinanceController.class.php     | 18 ++++++++++++++++++
 .../Home/Controller/QueryController.class.php  | 14 +++++++-------
 .../View/default/Finance/withdrawRecord.html   |  4 +++-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index 493ad6e6c..b783521f0 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -565,4 +565,22 @@ class FinanceController extends BaseController
         $this->assign('modelList', $modelList);
         $this->display();
     }
+
+    //审核拒绝 重新审核
+    public function renewReview($id)
+    {
+        //是否是会长
+        $this->purview();
+        //验证安全密码
+        $metaTitle = '结算明细';
+        $modelList = ['财务管理', $metaTitle];
+        $res = $this->verifyPasswordView($modelList, false);
+        if ($res == false) {
+            $data['status'] = 0;
+            $data['msg'] = '权限异常';
+            $this->ajaxReturn($data);
+        }
+
+        $id = intval($id);
+    }
 }
\ No newline at end of file
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 9bcdae958..bbbf0f56d 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1733,7 +1733,7 @@ class QueryController extends BaseController
         $pagination = '';
         $count = 0;
         if (intval($endTime - $begTime) / (24 * 3600) <= 31) {
-            $map[] = [
+            $map = [
                 '_logic' => 'or',
                 'id' => $queryPromote['id'],
                 'chain' => ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']
@@ -1812,19 +1812,19 @@ class QueryController extends BaseController
                 }
             }
 
-            $spendMap['uc . create_time'] = ['between', [$begTime, $endTime - 1]];
-            $spendMap['_string'] = 'uc . game_id = tab_user_play_info . game_id and uc . server_id = tab_user_play_info . server_id and uc . role_id = tab_user_play_info . role_id';
+            $spendMap['uc.create_time'] = ['between', [$begTime, $endTime - 1]];
+            $spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';
             $sqlCost = M('user_play_data_count', 'tab_')->alias('uc')
-                ->field('sum(uc . recharge_cost) cost')
+                ->field('sum(uc.recharge_cost) cost')
                 ->where($spendMap)
                 ->buildSql();
             $sqlCount = M('user_play_data_count', 'tab_')->alias('uc')
-                ->field('sum(uc . recharge_count) count')
+                ->field('sum(uc.recharge_count) count')
                 ->where($spendMap)
                 ->buildSql();
-            $spendMap['uc . create_time'] = ['between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]];
+            $spendMap['uc.create_time'] = ['between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]];
             $sqlTodayCost = M('user_play_data_count', 'tab_')->alias('uc')
-                ->field('sum(uc . recharge_count) count')
+                ->field('sum(uc.recharge_count) count')
                 ->where($spendMap)
                 ->buildSql();
             $subQuery = M('user_play_info', 'tab_')
diff --git a/Application/Home/View/default/Finance/withdrawRecord.html b/Application/Home/View/default/Finance/withdrawRecord.html
index cd9515a2f..59b56dfb0 100644
--- a/Application/Home/View/default/Finance/withdrawRecord.html
+++ b/Application/Home/View/default/Finance/withdrawRecord.html
@@ -173,8 +173,10 @@
                       <a href="{:U('withdrawDtl', array('id'=>$vo['id']))}">提现明细</a>
                       <if condition="$vo['status'] eq 2">
                           <a data-href="{:U('download/Remittancecer',['id'=>$vo['id']])}" class="ajax-get">汇款证明</a>
+                        <elseif condition="$vo['status'] eq -1"/>
+                        <a href="{:U('settlementOrder', array('id'=>$vo['id']))}" style="color: #0bb20c;">重新审核</a>
                       </if>
-                      <a href="{:U('settlementOrder', array('id'=>$vo['id']))}">结算单</a>
+                      <a href="{:U('renewReview', array('id'=>$vo['id']))}">结算单</a>
                     </td>
                   </tr>
                 </volist>