From f169d65c1c03f08975b54cb77c2b5cf0b00553bb Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 4 Sep 2020 14:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementController.class.php     | 2 +-
 .../Admin/Controller/CompanyStatementPoolController.class.php | 2 +-
 .../Admin/Controller/PromoteCompanyController.class.php       | 4 +++-
 Application/Base/Service/PromoteCompanyService.class.php      | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 6476fb261..ebbfe30c1 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -150,7 +150,7 @@ class CompanyStatementController extends ThinkController
         $data = M("company_statement","tab_")
             ->field("id,withdraw_type,company_name,company_belong,statement_begin_time,statement_end_time,statement_money,platform_amount,verify_status,verify_log,confirm_status,confirm_log,op_time,remark")
             ->where($map)
-            ->order("FIELD(verify_status,0,1,-1,2,3,-2,-3),id desc")->page($page,$row)->select();
+            ->order("statement_begin_time desc,id desc")->page($page,$row)->select();
 
         foreach($data as $k => &$v) {
 
diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index e3c9792d5..f18a6fbac 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -1054,7 +1054,7 @@ class CompanyStatementPoolController extends ThinkController
         $mentBtn = [
             "verifyAgree"=>"<a class='butn' id='verifyAgree'>审批通过</a>",
             "verifyRefuse"=>"<a class='butn' id='verifyRefuse' style='background-color: red;'>审核拒绝</a>",
-            "export"=>"<a class='butn' id='export'>批量导出</a>"
+            "export"=>"<a class='butn' id='export'>导出</a>"
         ];
         $resarr = [];
         foreach ($mentBtn as $k => $v) {
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 88e36503b..0e0e997d3 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -259,7 +259,7 @@ class PromoteCompanyController extends ThinkController
             $map["create_time"] =  ['ELT',$time_end];
         }
         $model = M("promote_company_verify", 'tab_');
-        $data =  $model->where($map)->page($page,$row)->order("FIELD(verify_status,0,1,-1,-2,2),id desc")->select();
+        $data =  $model->where($map)->page($page,$row)->order("create_time desc")->select();
         foreach ($data as $k => &$v) {
             $v['company_info'] = json_decode($v['company_info'],true);
             if($v['company_id'] == 0){
@@ -362,6 +362,7 @@ class PromoteCompanyController extends ThinkController
             $v['verify_log']['market_time']=date("Y-m-d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=-1;
+            $v["create_time"] = time();
             M("PromoteCompanyVerify", 'tab_')->save($v);
             addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]);
         }
@@ -381,6 +382,7 @@ class PromoteCompanyController extends ThinkController
             $v['verify_log']['admin_time']=date("Y-m-d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=-2;
+            $v["create_time"] = time();
             M("PromoteCompanyVerify", 'tab_')->save($v);
             addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]);
         }
diff --git a/Application/Base/Service/PromoteCompanyService.class.php b/Application/Base/Service/PromoteCompanyService.class.php
index 66c1c09df..a34dfe286 100644
--- a/Application/Base/Service/PromoteCompanyService.class.php
+++ b/Application/Base/Service/PromoteCompanyService.class.php
@@ -157,6 +157,7 @@ class PromoteCompanyService
         $verifyLog['admin_time'] = date("Y-m-d H:i:s");
         $application['verify_log'] = json_encode($verifyLog);
         $application['verify_status'] = 2;
+        $application["create_time"] = time();
         $companyInfo = json_decode($application['company_info'], true);
         
         $creator = M('ucenter_member', 'sys_')->field(['id', 'username'])->where(['username' => $verifyLog['create_user']])->find();
@@ -311,6 +312,7 @@ class PromoteCompanyService
         $application['verify_log']['market_time'] = date("Y-m-d H:i:s");
         $application['verify_log'] = json_encode($application['verify_log']);
         $application['verify_status'] = 1;
+        $application["create_time"] = time();
         M('promote_company_verify', 'tab_')->where(['id' => $application['id']])->save($application);
         addOperationLog(['op_type'=>1, 'key'=> $application['id'], "op_name"=>"市场部审核", 'url'=>U('index')]);
         return $application;