修改

app/system/controller/Audit.php

@@ -173,4 +173,150 @@ class Audit extends BaseController
             return app('json')->success('已驳回');
         }
     }
+    
+    
+    
+    
+    /**
+     * 第一步审核初始化
+     * @return type
+     */
+    public function typeAuditInit()
+    {
+        return app('json')->success([
+            'all'  => (new TypeAudit)->count(),
+            'wait' => (new TypeAudit)->where('status', 0)->count(),
+            'ok'   => (new TypeAudit)->where('status', 1)->count(),
+            'no'   => (new TypeAudit)->where('status', -1)->count(),
+        ]);
+    }
+
+    /**
+     * 获取第一步审核列表
+     * @param Request $request
+     */
+    public function typeAuditList(Request $request)
+    {
+        $pageSize = 50;
+        $post     = UtilService::getMore(
+            [
+                ['page', 1],
+                ['keyword',''],
+                ['mobile',''],
+                ['status', ''],
+                ['uid', ''],
+                ['time',[]],
+            ], $request
+        );
+        $where    = [];
+        if(is_numeric($post['status'])) {
+            $where[]=["t.status","=",(int)$post['status']];
+        }
+        if(is_numeric($post['uid']) && $post['uid']>0) {
+            $where[]=["t.uid","=",(int)$post['uid']];
+        }
+        if(is_mobile($post['mobile'])) {
+            $where[]=["t.mobile","=",$post['mobile']];
+        }
+        $startTime = "";
+        $endTime = "";
+        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
+           $startTime =  strtotime($post['time'][0]);
+           $endTime = strtotime($post['time'][1]);
+           $where[]=["t.time","between","{$startTime},{$endTime}"];
+        }
+        if(!empty($post['keyword'])){
+            $where[]=["t.name","=",$post['keyword']];
+        }
+        $pageCount = (new TypeAudit)->alias("t")->where($where)->count();
+        $data = null;
+        if($pageCount>0){
+            $data = (new TypeAudit)
+                ->alias("t")
+                ->field("t.*,u.nickname,a.username as admin_name,s.title as service_time_type_title")
+                ->leftJoin("user u", "u.uid = t.uid")
+                ->leftJoin("admin a", "a.id = t.admin_id")
+                ->leftJoin("service_time_type s", "s.code = t.service_type")
+                ->where($where)
+                ->page((int)$post["page"], $pageSize)
+                ->order("t.id","desc")
+                ->select()
+                ->toArray();
+        }
+        $data = empty($data) ? [] : $data;
+        $serviceTypeModel = new ServiceTypeModel();
+        foreach($data as $k=>$v){
+            $data[$k]["birthday"]   = empty($v["birthday"])  ?"":date("Y-m-d",$v["birthday"]);
+            $data[$k]["admin_time"] = empty($v["admin_time"])?"":date("Y-m-d H:i:s",$v["admin_time"]);
+            $data[$k]["time"]   = date("Y-m-d H:i:s",$v["time"]);
+            
+            $data[$k]["service_audit_imgs"] = getImageAr($v["service_audit_imgs"]);
+            $data[$k]["service_intro_imgs"] = getImageAr($v["service_intro_imgs"]);
+            
+            //服务区域
+            $data[$k]["service_area"] = getImageAr($v["service_area"]);
+            $data[$k]["service_area_all"] = [];
+            foreach($data[$k]["service_area"] as $k2=>$v2){
+                $data[$k]["service_area_all"][]=getAreaItemAr($v2);
+            }
+            //服务内容
+            $data[$k]["service_project"]    = getImageAr($v["service_project"]);
+            $data[$k]["service_project_ar"] = [];
+            if(!empty($data[$k]["service_project"])){
+                $data[$k]["service_project_ar"] = $serviceTypeModel->where("id","in",$data[$k]["service_project"])->select();
+            }
+        }
+        return app('json')->success([
+            'list'      => $data,
+            'pageCount' => $pageCount,
+            'pageSize'  => $pageSize,
+            'page'      => $post['page'],
+        ]);
+    }
+    /**
+     * 第一步审核处理
+     * @param Request $request
+     */
+    public function typeAuditSub(Request $request)
+    {
+        $post   = UtilService::getMore(
+            [
+                ['id', '', 'empty', '参数错误'],
+                ['mono'],
+                ['type', 0],
+            ], $request);
+        $certData = (new TypeAudit)->where('id', $post['id'])->find();
+        if (empty($certData)) {
+            return app('json')->fail('数据不存在');
+        }
+        if ($certData['status']!=0) {
+            return app('json')->fail( '当前审核已处理');
+        }
+        //审核通过
+        if ($post['type'] == 1) {
+            (new TypeAudit)
+                ->where('id', $post['id'])
+                ->save([
+                    'status'     => 1,
+                    'admin_mono' => $post['mono'],
+                    'admin_time' => time(),
+                    'admin_id'   => $request->adminInfo['id'],
+                ]);
+            return app('json')->success('操作成功');
+        }
+        //审核驳回
+        if ($post['type'] == -1) {
+            (new TypeAudit)
+                ->where('id', $post['id'])
+                ->save([
+                    'status'     => -1,
+                    'admin_mono' => $post['mono'],
+                    'admin_time' => time(),
+                    'admin_id'   => $request->adminInfo['id'],
+                ]);
+            return app('json')->success('已驳回');
+        }
+    }
+    
+    
 }

app/system/controller/ShowTemplate.php

@@ -3,7 +3,7 @@ declare (strict_types = 1);
 namespace app\system\controller;
 
 use app\BaseController;
-use app\model\api\ShowTemplate;
+use app\model\api\ShowTemplate as ShowTemplateModel;
 use app\Request;
 use library\services\UtilService;
 
@@ -44,10 +44,10 @@ class ShowTemplate extends  BaseController{
             $where[]=["is_recommend","=",1];
         }
         
-        $totalCount = (new ShowTemplate)->where($where)->count();
+        $totalCount = (new ShowTemplateModel)->where($where)->count();
         $data=null;
         if($totalCount>0){
-            $data = (new ShowTemplate)
+            $data = (new ShowTemplateModel)
                 ->field("*")
                 ->where($where)
                 ->order("id", "desc")
@@ -98,9 +98,9 @@ class ShowTemplate extends  BaseController{
         $r=0;
         if(empty($id) || $id=="0"){
             $save["time"] = time();
-            $r = (new ShowTemplate)->insert($post);
+            $r = (new ShowTemplateModel)->insert($post);
         }else{
-            $r = (new ShowTemplate)->where("id",$id)->update($save);
+            $r = (new ShowTemplateModel)->where("id",$id)->update($save);
         }
         if($r){
             return app('json')->success("数据保存成功");

app/system/controller/v1/ShowTemplate.php

@@ -1,103 +0,0 @@
-<?php
-declare (strict_types = 1);
-namespace app\system\controller;
-
-use app\BaseController;
-use app\model\api\ShowTemplate;
-use app\Request;
-use library\services\UtilService;
-
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | [ 皮肤模板管理 ]
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:53
-// +----------------------------------------------------------------------
-
-class ShowTemplate extends  BaseController{
-    /**
-     * 商品列表
-     * @param Request $request
-     * @return type
-     */
-    public function list(Request $request) {
-        $post = UtilService::getMore([
-            ['is_hot', '0'],
-            ['is_recommend', '0'],
-            ['page', 1],
-            ['pageSize', 50],
-        ], $request);
-        $post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
-        $post["page"]     = $post["page"]<=0 ? 1 : (int)$post["page"];
-        $where=[];
-        $where[]=["status","=",1];
-        if((int)$post["is_hot"]==1){
-            $where[]=["is_hot","=",1];
-        }
-        if((int)$post["is_recommend"]==1){
-            $where[]=["is_recommend","=",1];
-        }
-        
-        $totalCount = (new ShowTemplate)->where($where)->count();
-        $data=null;
-        if($totalCount>0){
-            $data = (new ShowTemplate)
-                ->field("*")
-                ->where($where)
-                ->order("id", "desc")
-                ->page((int)$page, $post["pageSize"])
-                ->select();
-            foreach($data as $k=>$v){
-                $data[$k]["is_use"] = 0;//是否已经购买或者可以使用
-                $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-            }
-        }
-        $data = empty($data)?[]:$data;
-        return app('json')->success(["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount]);
-    }
-
-    
-    /**
-     * 添加编辑商品
-     * @param Request $request
-     * @return type
-     */
-    public function add(Request $request){
-        $post = UtilService::getMore([
-            ['id','0'],
-            ['title','','empty','请填写模板标题'],
-            ['price','0','is_numeric','请输入正确的模板售价'],
-            ['old_price','0','is_numeric','请输入正确的模板原价'],
-            ['img','','empty','请上传模板展示图'],
-            ['is_hot','0'],
-            ['is_recommend','0'],
-            ['status','0'],
-        ],$request);
-        $save=[];
-        $save["title"]        = $post["title"];
-        $save["price"]        = floatval($post["price"]);
-        $save["old_price"]    = floatval($post["old_price"]);
-        $save["status"]       = (int)$post["status"]==1?1:0;
-        $save["img"]          = empty($post["img"]) ? "" : $post["img"];
-        $save["is_hot"]       = (int)$post["is_hot"]==1?1:0;
-        $save["is_recommend"] = (int)$post["is_ip"]==1?1:0;
-        $save["admin_time"]   = time();
-        $save["admin_id"]     = $request->adminInfo['id'];
-        $id = $post["id"];
-        $r=0;
-        if(empty($id) || $id=="0"){
-            $save["time"] = time();
-            $r = (new ShowTemplate)->insert($post);
-        }else{
-            $r = (new ShowTemplate)->where("id",$id)->update($save);
-        }
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
-        }
-    }
-}