Merge branch 'v0828-3.3.8' of https://gitee.com/zwyjjc/tl_estate into v0828-3.3.8

application/index/controller/DailyPaper.php

@@ -300,4 +300,31 @@ class DailyPaper extends Basic
         return $this->response("200", "success", ['img_url' => $img_url]);
     }
 
+    /**
+     * 转到审核中
+     *
+     * @return \think\Response
+     */
+    public function backDailyCheck()
+    {
+        if (empty($params["daily_id"])) {
+            return $this->response("101", "参数错误");
+        }
+
+        $m_daily = new ODaily();
+        $daily_id = $m_daily->getFieldValue('id', ['id'=>$this->params['daily_id'], 'status'=>1]);
+        if (empty($daily_id)) {
+            return $this->response("101", "没有该数据");
+        }
+
+        $num = $m_daily->updateDaily(['status'=>0], ['id'=>$daily_id]);
+        if ($num > 0) {
+            $code = 200;
+            $msg = '转到审核中成功';
+        } else {
+            $code = 101;
+            $msg = '转到审核中失败';
+        }
+        return $this->response($code, $msg);
+    }
 }
\ No newline at end of file

application/index/controller/OfficePayLog.php

@@ -2505,7 +2505,7 @@ class OfficePayLog extends Basic
         $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $data = [];
-
+        $where['a.type'] = 10;
         $where['a.is_del'] = 0;
         $where['a.source'] = ['<', 2];
         $msg = '';

application/index/controller/PayLog.php

@@ -14,6 +14,11 @@ use app\model\OPayLogModel;
 
 class PayLog extends Basic
 {
+    /**
+     * 意向金预警
+     *
+     * @return \think\Response
+     */
     public function intentionsWarning()
     {
         if (!$this->request->isAjax()) {
@@ -24,6 +29,7 @@ class PayLog extends Basic
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $data = [];
 
+        $where['a.type'] = 10;
         $where['a.is_del'] = 0;
         $where['a.source'] = ['<', 2];
         $msg = '';

application/route.php

@@ -495,6 +495,7 @@ Route::group('index', [
     'commitCheck'  => ['index/DailyPaper/commitCheck', ['method' => 'get|post']],
     'getPayLogImg' => ['index/DailyPaper/getPayLogImg', ['method' => 'get|post']],
     'dailyBackImg' => ['index/DailyPaper/dailyBackImg', ['method' => 'post']],
+    'backDailyCheck' => ['index/DailyPaper/backDailyCheck', ['method' => 'post']],
 
     'addUserBind'        => ['index/member/addUserBind', ['method' => 'get|post']],
     'removeUserBind'     => ['index/member/removeUserBind', ['method' => 'get|post']],