优化汇总方案

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -112,7 +112,7 @@ class CompanyStatementPoolController extends ThinkController
         $data = $this->DBModel
             ->field("*")
             ->where($map)
-            ->order("FIELD(verify_status,0,1,-1,-2,2,3,4,5),id desc")
+            ->order("id desc")
             ->page($page,$row)->select();
         foreach($data as $k => &$v) {
 
@@ -991,7 +991,7 @@ class CompanyStatementPoolController extends ThinkController
 
     //审批通过
     public function verifyAgree(){
-        $this->setVerifyStatus([1,6],1,"verify");
+        $this->setVerifyStatus([1,6],2,"verify");
     }
     public function verifyRefuse(){
         $this->setVerifyStatus([1,6],-1,"verify");
@@ -1121,6 +1121,7 @@ class CompanyStatementPoolController extends ThinkController
     public function editPayment(){
         if(!isset($_REQUEST['info'])) $this->error("参数错误");
         $info = $_REQUEST['info'];
+        $pool_id = $_REQUEST['pool_id'];
         $CompanyInfo = M("company_statement_info","tab_");
         //循环保存
         foreach($info as $k=>$v){
@@ -1148,12 +1149,15 @@ class CompanyStatementPoolController extends ThinkController
             }
             $CompanyInfo->save($savedata);
         }
-        $this->ajaxReturn(array(
+        $verify_status = $this->DBModel->field("verify_status")->where("id = {$pool_id}")->find()['verify_status'];
-            'status' => 1,
+        if( $verify_status == 6){
-            "info"=>"打款信息编辑成功"
+            $this->setOneVerifyStatus(1,"payment",$_REQUEST['pool_id'],$mgs = "打款信息确认");
-        ));
+        }else{
-        //修改状态
+            $this->ajaxReturn(array(
-    //    $this->setOneVerifyStatus(2,"payment",$_REQUEST['pool_id'],$mgs = "打款信息确认");
+                'status' => 1,
+                "info"=>"打款信息编辑成功"
+            ));
+        }
     }
     //查看打款信息
     public function viewPayment(){
@@ -1573,6 +1577,9 @@ class CompanyStatementPoolController extends ThinkController
             case '5':
                 $optist = ["viewPool","addRemark","viewRemark","editRemark","reCount","cancelPool"];
                 break;
+            case '6':
+                $optist = ["viewPool","addRemark","viewRemark","editRemark","reCount","cancelPool","setPayment"];
+                break;
             default:
                 break;
         }
@@ -1600,7 +1607,7 @@ class CompanyStatementPoolController extends ThinkController
             $optist = ['viewPool','cancelPool','editSpecialPuPool'];
         }
 
-        if($info['company_type'] == 2 && $info['verify_status'] == '0'&&$info['withdraw_type'] != "特殊补点") {
+        if($info['company_type'] == 2 && ($info['verify_status'] == '6' || $info['verify_status'] == '0') &&$info['withdraw_type'] != "特殊补点") {
             array_push($optist,"editPool");
         }