成交报告审核修改

application/index/controller/Finance.php

@@ -1257,8 +1257,8 @@ class Finance extends Basic
 
         $insert_data['audit_id']    = $this->userId;
         $insert_data['audit_name']  = $this->userName;
-        $insert_data['audit_level'] = 2;
-        $data                       = $m_bargain->addCheckBargain($this->params['bargain_id'], $insert_data, 1, 10);
+        $insert_data['audit_level'] = 3;
+        $data                       = $m_bargain->addCheckBargain($this->params['bargain_id'], $insert_data, 1, 11);
 
         $code = 200;
         $msg  = "";

application/model/OBargainModel.php

@@ -372,7 +372,7 @@ class OBargainModel extends Model
      */
     public function addCheckBargain(int $id, array $data, int $source, int $status): bool
     {
-//        $this->startTrans();
+        $this->startTrans();
         $bargain_data = $this->field('id,report_id,agent_id,order_no,order_id')->where([
             'id'     => $id,
             'status' => [ 'in', '10,11,20,21' ]
@@ -396,23 +396,20 @@ class OBargainModel extends Model
             //是否有审核记录，只做一次审核。
             if (isset($audit_data['id'])) {
                 //第二、三审核
-                if ($audit_data['audit_level'] == $data['audit_level']) {
                 $save_data['audit_level'] = $data['audit_level'];
                 $return                   = $audit->addAudit($save_data);
-                }
+
             } else {
                 //第一步审核
-                if ($data['audit_level'] == 1) {
-                    $save_data['audit_level'] = 0;
+                    $save_data['audit_level'] = 1;
                     $return                   = $audit->addAudit($save_data);
             }
-            }
 
             if ($return) {
-                if ($status == 10){
+                if ($status == 10 && $data['audit_level'] == 1){
                     //审核开始
                     $update_data['status'] = 11;
-                } elseif ($data['audit_level'] == 2 && $status == 11) {
+                } elseif ($data['audit_level'] == 3 && $status == 11) {
                     //成交报告审核-三级审核结束
                     $update_data['status']            = 13;
                     $update_data['account_statement'] = 1;
@@ -422,10 +419,10 @@ class OBargainModel extends Model
                     $update_data['status']            = 21;
                     $update_data['account_statement'] = 1;
                     $update_data['account_time']      = date('Y-m-d H:i:s');
-                } else {
+                }
+
                 //记录第几级审核-与 OFinancialAudit 表一致
                 $update_data['audit_level'] = $data['audit_level'];
-                }
                 $this->where('id', $bargain_data['id'])->whereOr('father_id', $bargain_data['id'])->update($update_data);
                 $this->commit();
                 $result = true;