财务结单 和 转到一级审核

application/index/controller/Finance.php

@@ -16,6 +16,7 @@ use app\model\AAgents;
 use app\model\AStore;
 use app\model\OBargainModel;
 use app\model\OFee;
+use app\model\OFinancialAudit;
 use app\model\OPartialCommission;
 use app\model\OPayLogModel;
 use app\model\ORefundModel;
@@ -833,4 +834,60 @@ class Finance extends Basic
         $data['data']['total']  = $m_bargain->getCommissionTotalListTotal($where, $whereOr);
         return $this->response($data['code'], $data['msg'], $data['data']);
     }
+
+    /**
+     * 回到一级审核
+     *
+     * @return \think\Response
+     */
+    public function toReportListOne() {
+
+        if (empty($this->params['bargain_id'])) {
+            return $this->response(101, '参数错误');
+        }
+
+        $m_financial = new OFinancialAudit();
+        $data['status'] = 3;
+        $data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id');
+
+        $msg = '';
+        if ($data > 0) {
+            $code = 200;
+        } else {
+            $code = 101;
+            $msg  = '操作失败！';
+        }
+        return $this->response( $code, $msg);
+    }
+
+    /**
+     * 财务结单
+     *
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function checkOver() {
+        if (empty($this->params['bargain_id'])) {
+            return $this->response(101, '参数错误');
+        }
+
+        $m_bargain = new OBargainModel();
+
+        $insert_data['audit_id'] = $this->userId;
+        $insert_data['audit_name'] = $this->userName;
+        $insert_data['audit_level'] = 3;
+        $data = $m_bargain->addCheckBargain($this->params['bargain_id'], $insert_data, 1, 10);
+
+        $code = 200;
+        $msg  = "";
+        if (!$data) {
+            $code = 101;
+            $msg = '参数错误结单失败！';
+        }
+
+        return $this->response( $code, $msg);
+    }
 }

application/model/OBargainModel.php

@@ -304,11 +304,10 @@ class OBargainModel extends Model
             $save_data['audit_id']    = $data['audit_id'];
             $save_data['audit_name']  = $data['audit_name'];
             $return = 0;
-
-            $audit_level = $data['audit_level'] - 1;
+            $audit_level = $data['audit_level']-1;
             //是否有审核记录，只做一次审核。
             if (isset($audit_data['id'])) {
-                //第二、三、四审核
+                //第二、三审核
                 if ($audit_data['audit_level'] == $audit_level) {
                     $save_data['audit_level'] = $data['audit_level'];
                     $return = $audit->addAudit($save_data);
@@ -323,11 +322,13 @@ class OBargainModel extends Model
 
             if ($return) {
 
-                if ($data['audit_level'] == 3 && $source = 10) {
-                    $this->where('id',$bargain_data['id'])->setField('status',11);
+                if ($data['audit_level'] == 3 && $status == 10) {
+                    $update_data['status'] = 11;
+                    $update_data['account_statement'] = 1;
+                    $this->save($update_data,['id'=>$bargain_data['id']]);
                 }
 
-                if ($data['audit_level'] == 3 && $source = 20) {
+                if ($data['audit_level'] == 3 && $status == 20) {
                     $this->where('id',$bargain_data['id'])->setField('status',21);
                 }
 

application/route.php

@@ -172,6 +172,7 @@ Route::group('index', [
     'lable'                 => [ 'index/label/index', [ 'method' => 'get' ] ],  //标签列表
     'getDistrict'           => [ 'index/District/getList', [ 'method' => 'get' ] ], //获取部门列表
     //数据统计
+<<<<<<< HEAD
     'RemarkFollowList'      => [ 'index/remark/followUpList', [ 'method' => 'get' ] ],//跟进列表
     'phone_list'            => [ 'index/Phone/index', [ 'method' => 'get' ] ],//隐私号码列表
     'bindPhoneList'         => [ 'index/Phone/bindPhoneList', [ 'method' => 'get' ] ],//绑定的隐私号码列表
@@ -228,6 +229,8 @@ Route::group('index', [
     'getCollection'                      => [ 'index/Collection/getCollection', [ 'method' => 'post|get' ] ],//收款记录
     'visitShop'                          => [ 'index/Supervise/visitShop', [ 'method' => 'get' ] ],//门店拜访
     'carryOut'                           => [ 'index/Supervise/carryOut', [ 'method' => 'get' ] ],//监督执行
+    'toReportListOne'                    => ['index/Finance/toReportListOne', [ 'method' => 'POST' ] ], //回到一级审核
+    'checkOver'                          => ['index/Finance/checkOver', [ 'method' => 'POST' ] ], //财务结单
 ]);