修改审核判断逻辑

application/model/OBargainModel.php

@@ -372,15 +372,15 @@ 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' ]
+            'status' => [ 'in', '10,11,20,21' ]
         ])->find();
 
         if ($bargain_data != '') {
             $audit      = new OFinancialAudit();
-            $audit_data = $audit->getLastStep($bargain_data['id']);
+            $audit_data = $audit->getLastStep($bargain_data['id']);  //获取最后一次审核等级
 
             $save_data['bargain_id'] = $bargain_data['id'];
             $save_data['agent_id']   = $bargain_data['agent_id'];
@@ -410,21 +410,24 @@ class OBargainModel extends Model
             }
 
             if ($return) {
-
-                if ($data['audit_level'] == 2 && $status == 10) {
+                if ($status == 10){
+                    //审核开始
+                    $update_data['status'] = 11;
+                } elseif ($data['audit_level'] == 2 && $status == 11) {
+                    //成交报告审核-三级审核结束
                     $update_data['status']            = 13;
                     $update_data['account_statement'] = 1;
                     $update_data['account_time']      = date('Y-m-d H:i:s');
-                    $this->where('id', $bargain_data['id'])->whereOr('father_id', $bargain_data['id'])->update($update_data);
+                } elseif ($data['audit_level'] == 2 && $status == 20) {
+                    //撤销审核结束
+                    $update_data['status']            = 21;
+                    $update_data['account_statement'] = 1;
+                    $update_data['account_time']      = date('Y-m-d H:i:s');
                 } else {
-                    $update_data['status'] = 11;
-                    $this->save($update_data, [ 'id' => $bargain_data['id'] ]);
-                }
-
-                if ($data['audit_level'] == 2 && $status == 20) {
-                    $this->where('id', $bargain_data['id'])->setField('status', 21);
+                    //记录第几级审核-与 OFinancialAudit 表一致
+                    $update_data['audit_level'] = $save_data['audit_level'];
                 }
-
+                $this->where('id', $bargain_data['id'])->whereOr('father_id', $bargain_data['id'])->update($update_data);
                 $this->commit();
                 $result = true;
             } else {