修改

app/system/controller/v1/Activity.php

@@ -1,189 +0,0 @@
-<?php
-declare (strict_types = 1);
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\model\api\User as UserModel;
-use app\model\api\Activity as ActivityModel;
-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 Activity extends  BaseController{
-    private $activityDefaultParms = [
-        ["title"=>"联系电话","type"=>"input","required"=>1,"content"=>"","parms"=>[]],
-        ["title"=>"联系人","type"=>"input","required"=>1,"content"=>"","parms"=>[]],
-    ];
-    private $activityFromType=[
-        ["title"=>"文本输入框","type"=>"input"],
-        ["title"=>"下拉选择框","type"=>"select"],
-        ["title"=>"文本域","type"=>"textarea"],
-    ];
-    /**
-     * 活动列表
-     * @param Request $request
-     * @return type
-     */
-    public function list(Request $request) {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-                ['page',1],
-                ['title',''],
-                ['is_main',''],
-                ['status',''],
-                ['is_show',''],
-                ['time',[]],
-        ],$request);
-        $where = [];
-        //添加时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $where[]=["c.add_time","between","{$startTime},{$endTime}"];
-        }
-        if (!empty($post["title"])){
-            $where[]=["c.title","like","%{$post['title']}%"];
-        }
-        if (!empty($post["is_main"]) && (int)$post["is_main"]==1){
-            $where[]=["c.is_main","=",1];
-        }
-        if(in_array((string)$post["status"],['1','0'])){
-            //活动已经结束
-            if((string)$post["status"]=="0"){
-                $where[]=["c.time","<=",time()];
-            }
-            //报名中
-            if((string)$post["status"]=="1"){
-                $where[]=["c.time",">",time()];
-            }
-        }
-        if(in_array((string)$post["is_show"],['1','0'])){
-            $where[]=["c.is_show","=",(int)$post["is_show"]];
-        }
-        $data = (new ActivityModel)
-                ->field("c.*,IFNULL(o.order_count,0) as order_count")
-                ->alias("c")
-                ->leftJoin("(select count(*) as order_count,activity_id  from table_activity_order where status > 0 group by activity_id) as o","o.activity_id = c.id")
-                ->where($where)
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("c.is_main","desc")
-                ->order("c.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new ActivityModel)->alias("c")->where($where)->count();
-        $data = empty($data)?[]:$data;
-        $defaultParms=$this->activityDefaultParms;
-        foreach($data as $k=>$v){
-            $data[$k]["imgs"]     = empty($v["imgs"]) ? [] : explode(",",$v["imgs"]);
-            $data[$k]["descs"]    = empty($v["descs"]) ? [] : explode(",",$v["descs"]);
-            $data[$k]["labels"]   = empty($v["labels"]) ? [] : explode(",",$v["labels"]);
-            $data[$k]["time"]     = date("Y-m-d H:i:s",$v["time"]);
-            $data[$k]["add_time"] = date("Y-m-d H:i:s",$v["add_time"]);
-            $data[$k]["status"]   = $v["time"] > time() ? 1 : 0;
-            $data[$k]["data"]        = empty($v["data"]) ? [] : unserialize($v["data"]);
-        }
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"],
-            'defaultParms' => $defaultParms,
-            'activityFromType'=>$this->activityFromType,
-        ]);
-    }
-
-    
-    /**
-     * 添加编辑活动
-     * @param Request $request
-     * @return type
-     */
-    public function add(Request $request){
-        $post = UtilService::getMore([
-            ['id','0'],
-            ['title','','empty','请填写活动标题'],
-            ['mono',''],
-            ['deposits_price','0','is_numeric','请输入正确的活动定金'],
-            ['time','','empty','请选择活动时间'],
-            ['time_str',''],
-            ['address',''],
-            ['imgs',[],'empty','请上传活动主图'],
-            ['descs',[],'empty','请上传活动详情图'],
-            ['labels',[]],
-            ['is_show','0'],
-            ['is_main','0'],
-            ['data',[],'empty','请添加报名参数'],
-        ],$request);
-        $post["deposits_price"] = floatval($post["deposits_price"]);
-        $post["time"] = strtotime($post["time"]);
-        $post["imgs"] = empty($post["imgs"]) ? "" : implode(",", $post["imgs"]);
-        $post["descs"] = empty($post["descs"]) ? "" : implode(",", $post["descs"]);
-        $post["labels"] = empty($post["labels"]) ? "" : implode(",", $post["labels"]);
-        $post["is_show"] = (int)$post["is_show"];
-        $post["is_main"] = (int)$post["is_main"];
-        if($post["is_main"]==1){
-            (new ActivityModel)->where("is_main",1)->update(["is_main"=>0]);
-        }
-        //参数添加
-        $parmsAr = empty($post["data"]) ? [] : $post["data"];
-        $post["data"]=[];
-        $activityFromType = $this->activityFromType;
-        foreach($parmsAr as $k=>$v){
-            if(!empty($v["title"]) && !empty($v["type"])){
-                $check = false;
-                foreach($activityFromType as $k2=>$v2){
-                    if($v2["type"]==$v["type"]){
-                        $check = true;
-                        break;
-                    }
-                }
-                if(!$check){
-                    return app('json')->fail("请选择正确的参数类型");
-                }
-                if($v["type"]=="select" && (empty($v["parms"]) || !is_array($v["parms"]))){
-                    return app('json')->fail("请添加下拉选择框的选项值");
-                }
-                if($v["type"]!="select"){
-                    $v["parms"] = [];
-                }
-                $post["data"][]=[
-                    "title"   => trim($v["title"]),
-                    "content" => trim($v["content"]),
-                    "type"    => trim($v["type"]),
-                    "required"=> (int)$v["required"]==1?1:0,
-                    "parms"   => $v["parms"],
-                ];
-            }
-        }
-        $post["data"] = serialize($post["data"]);
-        
-        
-        $id = $post["id"];
-        unset($post["id"]);
-        $r=0;
-        if(empty($id) || $id=="0"){
-            $post["add_time"] = time();
-            $r = (new ActivityModel)->insert($post);
-        }else{
-            $r = (new ActivityModel)->where("id",$id)->update($post);
-        }
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
-        }
-    }
-
-    
-}

app/system/controller/v1/Circle.php

@@ -1,138 +0,0 @@
-<?php
-declare (strict_types = 1);
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\model\api\AdverPage;
-use app\model\api\Advert;
-use app\model\api\User as UserModel;
-use app\model\api\GoodsCate;
-use app\model\api\UserCircle;
-use app\Request;
-use library\services\UtilService;
-use think\facade\Db;
-
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | [ 圈子管理 ]
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:53
-// +----------------------------------------------------------------------
-
-class Circle extends  BaseController{
-    
-    /**
-     * 动态列表
-     * @param Request $request
-     * @return type
-     */
-    public function list(Request $request) {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-                ['page',1],
-//                ['title',''],
-                ['nickname',''],
-                ['status',''],
-                ['uid',''],
-                ['mobile',''],
-                ['uip',''],
-                ['time',[]],
-        ],$request);
-        $where = [];
-        //创建时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $where[]=["c.time","between","{$startTime},{$endTime}"];
-        }
-        //用户
-        if(!empty($post['uid'])){
-            $where[]=["c.uid","=",$post['uid']];
-        }else if (!empty($post['uip'])) {
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=["c.uid","=",$m['uid']];
-            }
-        }else if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["c.uid","=",$m['uid']];
-            }
-        }else if(!empty($post['nickname'])){
-            $m  = Db::name("user")->where("nickname",$post['nickname'])->find();
-            if(!empty($m)) {
-                $where[]=["c.uid","=",$m['uid']];
-            }
-        }
-//        if (!empty($post["title"])){
-//            $where[]=["c.title","like","%{$post['title']}%"];
-//        }
-        $where2 = $where;
-        $where2[]=["c.status","=",0];//待审核
-        if(in_array((string)$post["status"],['0','1','-1'])){
-            $where[]=["c.status","=",(int)$post["status"]];
-        }
-        $data = (new UserCircle)
-                ->field("c.*,u.nickname,g.imgs as pro_imgs,g.title as pro_title")
-                ->alias("c")
-                ->where($where)
-                ->leftJoin("user u", "u.uid = c.uid")
-                ->leftJoin("goods g", "g.id = c.pro_id")
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("c.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new UserCircle)->alias("c")->where($where)->count();
-        $waitCount = (new UserCircle)->alias("c")->where($where2)->count();
-        $data = empty($data)?[]:$data;
-        foreach($data as $k=>$v){
-            $data[$k]["imgs"] = empty($v["imgs"])?[]:explode(",",$v["imgs"]);
-            $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-            $data[$k]["pro_img"] = empty($v["pro_imgs"]) ? "" : explode(",", $v["pro_imgs"])[0];
-        }
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"],
-            'waitCount' => $waitCount,
-        ]);
-    }
-    /**
-     * 审核动态
-     * @param Request $request
-     */
-    public function editStatus(Request $request) {
-        [$id,$status] = UtilService::getMore([
-            ['id',0,'empty','参数错误'],
-            ['status','','empty','参数错误']
-        ],$request,true);
-        
-        $data = (new UserCircle)->where("id",$id)->find();
-        if(empty($data)){
-            return app('json')->fail("数据不存在");
-        }
-        //禁用
-        if($status==-1){
-            (new UserCircle)->where("id",$id)->update(["status"=>-1]);
-        }
-        //删除
-        if($status==-10){
-            (new UserCircle)->where("id",$id)->delete();
-        }
-        //发布
-        if($status==1){
-            (new UserCircle)->where("id",$id)->update(["status"=>1]);
-        }
-        return app('json')->success("操作成功");
-    }
-    
-    
-
-    
-}

app/system/controller/v1/Goods.php

@@ -1,371 +0,0 @@
-<?php
-declare (strict_types = 1);
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\model\api\User;
-use app\model\api\GoodsCate;
-use app\model\api\Coupon as CouponModel;
-use app\model\api\Goods as GoodsModel;
-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 Goods extends  BaseController{
-    
-    private $goodsDefaultParms = [
-        ["title"=>"赋意","content"=>""],
-        ["title"=>"盆","content"=>""],
-        ["title"=>"配花","content"=>""],
-        ["title"=>"配草","content"=>""],
-        ["title"=>"插件","content"=>""],
-        ["title"=>"IP","content"=>""],
-        ["title"=>"时间","content"=>""],
-        ["title"=>"花开","content"=>""],
-    ];
-    /**
-     * 商品列表
-     * @param Request $request
-     * @return type
-     */
-    public function list(Request $request) {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-                ['page',1],
-                ['title',''],
-                ['is_hot',''],
-                ['is_hot_sell',''],
-                ['is_ip',''],
-                ['status',''],
-                ['cate_id',''],
-                ['uip',''],
-                ['time',[]],
-        ],$request);
-        $where = [];
-        
-        if (!empty($post["title"])){
-            $where[]=["g.title","like","%{$post['title']}%"];
-        }
-        if(in_array((string)$post["is_hot"],['1','0'])){
-            $where[]=["g.is_hot","=",(int)$post["is_hot"]];
-        }
-        if(in_array((string)$post["is_hot_sell"],['1','0'])){
-            $where[]=["g.is_hot_sell","=",(int)$post["is_hot_sell"]];
-        }
-        if(in_array((string)$post["is_ip"],['1','0'])){
-            $where[]=["g.is_ip","=",(int)$post["is_ip"]];
-        }
-        if(in_array((string)$post["status"],['1','0'])){
-            $where[]=["g.status","=",(int)$post["status"]];
-        }
-        if (!empty($post["cate_id"])){
-            $where[]=["g.cate_id","=",$post['cate_id']];
-        }
-        if (!empty($post["uip"])){
-            $where[]=["g.uip","=",$post['uip']];
-        }
-        //更新时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $where[]=["g.update_time","between","{$startTime},{$endTime}"];
-        }
-        $data = (new GoodsModel)
-                ->field("g.*")
-                ->alias("g")
-                ->where($where)
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("g.update_time","desc")
-                ->order("g.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new GoodsModel)->alias("g")->where($where)->count();
-        $defaultParms=$this->goodsDefaultParms;
-        $data = empty($data)?[]:$data;
-        foreach($data as $k=>$v){
-            $data[$k]["imgs"]        = empty($v["imgs"]) ? [] : explode(",",$v["imgs"]);
-            $data[$k]["descs"]       = empty($v["descs"]) ? [] : explode(",",$v["descs"]);
-            $data[$k]["time"]        = date("Y-m-d H:i:s",$v["time"]);
-            $data[$k]["update_time"] = date("Y-m-d H:i:s",$v["update_time"]);
-            $data[$k]["cate_id"]     = empty($v["cate_id"])?"":$v["cate_id"];
-            $data[$k]["data"]        = empty($v["data"]) ? [] : unserialize($v["data"]);
-        }
-        return app('json')->success([
-            'list'         => $data,
-            'pageCount'    => $pageCount,
-            'pageSize'     => $pageSize,
-            'page'         => $post["page"],
-            'defaultParms' => $defaultParms,
-        ]);
-    }
-
-    
-    /**
-     * 添加编辑商品
-     * @param Request $request
-     * @return type
-     */
-    public function add(Request $request){
-        $post = UtilService::getMore([
-            ['id','0'],
-            ['cate_id','','empty','请选择商品分类'],
-            ['title','','empty','请填写商品标题'],
-            ['describe',''],
-            ['price','0','is_numeric','请输入正确的售价'],
-            ['old_price','0','is_numeric','请输入正确的原价'],
-            ['imgs',[],'empty','请上传商品主图'],
-            ['descs',[],'empty','请上传商品详情图'],
-            ['is_hot','0'],
-            ['is_hot_sell','0'],
-//            ['uip',''],
-            ['is_ip','0'],
-            ['ip_title',''],
-            ['ip_price','0'],
-            ['ip_income_per','0','is_numeric','请输入IP收益百分比'],
-            ['status','0'],
-            ['give_score','0','is_numeric','请输入正确的赠送积分'],
-            ['data',[]],
-        ],$request);
-        if($post["is_ip"]==1 && (!is_numeric(trim($post["ip_price"])) || trim($post["ip_price"])<=0)){
-            return app('json')->fail("'请输入买断售价");
-        }
-        if($post["is_ip"]==1){
-            $post["ip_price"] = floatval(trim($post["ip_price"]));
-        }else{
-            $post["ip_price"] = 0;
-        }
-        
-        
-        $post["ip_income_per"] = empty($post["ip_income_per"])?0:(int)$post["ip_income_per"];
-        $post["price"] = floatval($post["price"]);
-        $post["old_price"] = floatval($post["old_price"]);
-        $post["imgs"] = empty($post["imgs"]) ? "" : implode(",", $post["imgs"]);
-        $post["descs"] = empty($post["descs"]) ? "" : implode(",", $post["descs"]);
-        $post["is_hot"] = (int)$post["is_hot"]==1?1:0;
-        $post["is_hot_sell"] = (int)$post["is_hot_sell"]==1?1:0;
-        $post["is_ip"] = (int)$post["is_ip"]==1?1:0;
-        $post["ip_price"] = floatval($post["ip_price"]);
-        $post["status"] = (int)$post["status"]==1?1:0;
-        $post["give_score"] = (int)$post["give_score"];
-        $post["update_time"] = time();
-        if($post["is_ip"]==1 && $post["ip_price"]<=0){
-            return app('json')->fail("请输入正确的买断售价");
-        }
-        if($post["is_ip"]==1 && ($post["ip_income_per"]<0 || $post["ip_income_per"]>100)){
-            return app('json')->fail("请输入正确的IP分成比例");
-        }
-        if(!empty($post["uip"])){
-            $udata = (new User)->where("uip",$post["uip"])->find();
-            if(empty($udata)){
-                return app('json')->fail("用户不存在");
-            }
-            $post["uid"] = $udata["uid"];
-            $post["uip"] = $udata["uip"];
-        }
-        $parmsAr = empty($post["data"]) ? [] : $post["data"];
-        $post["data"]=[];
-        foreach($parmsAr as $k=>$v){
-            if(!empty($v["title"]) && !empty($v["content"])){
-                $post["data"][]=[
-                    "title"   => trim($v["title"]),
-                    "content" => trim($v["content"]),
-                ];
-            }
-        }
-        $post["data"] = serialize($post["data"]);
-        $id = $post["id"];
-        unset($post["id"]);
-        $r=0;
-        if(empty($id) || $id=="0"){
-            $post["time"] = time();
-            $r = (new GoodsModel)->insert($post);
-        }else{
-            $r = (new GoodsModel)->where("id",$id)->update($post);
-        }
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
-        }
-    }
-    /**
-     * 删除商品
-     * @param Request $request
-     */
-    public function del(Request $request) {
-        
-    }
-    /**
-     * 优惠券列表
-     * @param Request $request
-     * @return type
-     */
-    public function coupon(Request $request) {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-            ['page',1],
-            ['status',''],
-        ],$request);
-        $where=[];
-        if((string)$post["status"]!=""){
-            $where[]=["status","=",(int)$post["status"] == 1 ? 1 : 0];
-        }
-        $data = (new CouponModel)
-                ->where($where)
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("id","desc")
-                ->order("seq","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new CouponModel)->where($where)->count();
-        $data = empty($data)?[]:$data;
-        foreach($data as $k=>$v){
-            $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-        }
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"]
-        ]);
-    }
-    /**
-     * 添加编辑优惠券
-     * @param Request $request
-     */
-    public function couponAdd(Request $request){
-        $post = UtilService::getMore([
-            ['id','0'],
-            ['title','','empty','请填写优惠券标题'],
-            ['price','','is_numeric','请填写正确的优惠券面值'],
-            ['limit_price','','is_numeric','请填写正确的满减标准'],
-            ['day','','is_numeric','请填写正确的有效天数'],
-            ['seq','0'],
-            ['status','0']
-        ],$request);
-        $id = (int)$post["id"];
-        unset($post["id"]);
-        $post["price"] = floatval($post["price"]);
-        $post["limit_price"] = floatval($post["limit_price"]);
-        $post["day"] = intval($post["day"]);
-        $post["seq"] = intval($post["seq"]);
-        $post["status"] = intval($post["status"])==1?1:0;
-        if($post["price"]<=0){
-            return app('json')->fail("请输入正确的优惠券面值");
-        }
-        $r=0;
-        if(empty($id)){
-            $post["time"] = time();
-            $r = (new CouponModel)->insert($post);
-        }else{
-            $r = (new CouponModel)->where("id",$id)->update($post);
-        }
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
-        }
-    }
-    /**
-     * 删除优惠券
-     * @param Request $request
-     */
-    public function couponDel(Request $request) {
-        [$id] = UtilService::getMore([
-            ['id',0,'empty','参数错误']
-        ],$request,true);
-        $bool =   (new CouponModel)->where("id",$id)->delete();
-        return app('json')->success("删除成功");
-    }
-    
-    
-    /**
-     * 商品分类列表
-     * @param Request $request
-     * @return type
-     */
-    public function cate(Request $request) {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-                ['page',1],
-                ['title',''],
-        ],$request);
-        $data = (new GoodsCate)
-                ->when(1 == 1, function ($query) use ($request, $post) {
-                    if (!empty($post["title"])){
-                        $query->where("title",$post["title"]);
-                    }
-                })
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("sort","desc")
-                ->order("id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new GoodsCate)
-                ->when(1 == 1, function ($query) use ($request, $post) {
-                    if (!empty($post["title"])){
-                        $query->where("title",$post["title"]);
-                    }
-                })
-                        ->count();
-        $data = empty($data)?[]:$data;
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"]
-        ]);
-    }
-
-    /**
-     * 添加分类
-     */
-    public function cateAdd(Request $request){
-        $post = UtilService::getMore([
-            ['id','0'],
-            ['title','','empty','请填写分类名称'],
-            ['sort','0'],
-            ['code',''],
-            ['img','','empty','请上传分类图标'],
-            ['is_show','0']
-        ],$request);
-        $id = $post["id"];
-        unset($post["id"]);
-        $r=0;
-        if(empty($id) || $id=="0"){
-            $r = (new GoodsCate)->insert($post);
-        }else{
-            $r = (new GoodsCate)->where("id",$id)->update($post);
-        }
-        
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
-        }
-    }
-
-    /**
-     * 分类删除
-     * @param Request $request
-     */
-    public function cateDel(Request $request) {
-        [$id] = UtilService::getMore([
-            ['id',0,'empty','参数错误']
-        ],$request,true);
-        $bool =   (new GoodsCate)->where("id",$id)->delete();
-        return app('json')->success("分类删除成功");
-    }
-
-}

app/system/controller/v1/Label.php

@@ -1,99 +0,0 @@
-<?php
-declare (strict_types = 1);
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\model\api\AdverPage;
-use app\model\api\Label as LabelModel;
-use app\model\api\GoodsCate;
-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 Label extends  BaseController{
-    
-    /**
-     * 标签列表
-     * @param Request $request
-     * @return type
-     */
-    public function list(Request $request) {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-                ['page',1],
-                ['name',''],
-                ['is_show',''],
-        ],$request);
-        $where=[];
-        if(in_array((string)$post["is_show"],['0','1'])){
-            $where[]=["is_show","=",(int)$post["is_show"]];
-        }
-        if(!empty($post["name"])){
-            $where[]=["name","like","%{$post["name"]}%"];
-        }
-        $data = (new LabelModel)
-                ->where($where)
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("seq","desc")
-                ->order("id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new LabelModel)->where($where)->count();
-        $data = empty($data)?[]:$data;
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"]
-        ]);
-    }
-
-    /**
-     * 标签添加
-     */
-    public function add(Request $request){
-        $post = UtilService::getMore([
-            ['id','0'],
-            ['name','','empty','请输入标签名称'],
-            ['seq','0'],
-            ['type','activity'],
-            ['is_show','1']
-        ],$request);
-        $id = $post["id"];
-        unset($post["id"]);
-        $r=0;
-        if(empty($id) || $id=="0"){
-            $r = (new LabelModel)->insert($post);
-        }else{
-            $r = (new LabelModel)->where("id",$id)->update($post);
-        }
-        
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
-        }
-    }
-
-    /**
-     * 标签删除
-     * @param Request $request
-     */
-    public function del(Request $request) {
-        [$id] = UtilService::getMore([
-            ['id',0,'empty','参数错误']
-        ],$request,true);
-        $bool =   (new LabelModel)->where("id",$id)->delete();
-        return app('json')->success("分类删除成功");
-    }
-
-}

app/system/controller/v1/Log.php

@@ -1,224 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// |
-// +----------------------------------------------------------------------
-// | Date: 2020-08-31 20:43
-// +----------------------------------------------------------------------
-
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\model\system\AdminLog;
-use app\model\api\UserLogin;
-use app\model\api\User as UserModel;
-use library\services\UtilService;
-use library\utils\IpLocation;
-
-class Log extends BaseController
-{
-
-    public function list()
-    {
-        $pageSize = 50;
-        $post     = UtilService::getMore([
-            ['page', 1],
-            ['data', ''],
-            ['action', ''],
-            ['username', ''],
-            ['ip', ''],
-        ]);
-        list($pageCount, $data) = (new AdminLog())
-            ->getList($post['page'], [function ($query) use ($post) {
-                if ($post['data'] == "lately7") {
-                    $sTime = date('Y-m-d', strtotime('-7 day'));
-                    $eTime = date('Y-m-d');
-                    $query->whereBetweenTime('time', $sTime, $eTime);
-                } else if ($post['data'] == "lately30") {
-                    $sTime = date('Y-m-d', strtotime('-30 day'));
-                    $eTime = date('Y-m-d');
-                    $query->whereBetweenTime('time', $sTime, $eTime);
-                } else if ($post['data'] == "today") {
-                    $query->whereTime('time', 'today');
-                } else if ($post['data'] == "yesterday") {
-                    $query->whereTime('time', 'yesterday');
-                } else if ($post['data'] == "month") {
-                    $query->whereMonth('time');
-                } else if ($post['data'] == "year") {
-                    $query->whereYear('time');
-                } else {
-                    $split = explode('-', $post['data']);
-                    if (count($split) == 2) {
-                        $sTime = $split[0];
-                        $eTime = $split[1];
-                        $query->whereBetweenTime('time', $sTime, $eTime);
-                    }
-                }
-                if (!empty($post['username'])) {
-                    $query->whereLike('admin_username', "%{$post['username']}%");
-                }
-
-                if (!empty($post['action'])) {
-                    $query->whereLike('action', "%{$post['action']}%");
-                }
-
-                if (!empty($post['ip'])) {
-                    $query->whereLike('ip', "%{$post['ip']}%");
-                }
-            },
-            ], $pageSize, '*', 'id desc');
-        $result = UtilService::getParam([
-            'id',
-            'ip',
-            'admin_username',
-            'action',
-            'controller',
-            'title',
-            'post',
-            'get',
-            ['time', 'time', 'date("Y-m-d H:i:s",$1)'],
-            ['ipara', 'ip', function ($item) {
-                return "";
-//                return (new IpLocation())->getlocation($item)['country'];
-            }],
-        ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-
-    /**
-     * 清理一个月之前的数据
-     */
-    public function delMonth()
-    {
-        $time = strtotime('- 1 month');
-        AdminLog::where('time', '<', $time)->delete();
-        return app('json')->success('清理成功');
-    }
-    
-    
-    
-    public function listLoginLog()
-    {
-        $pageSize = 50;
-        $post     = UtilService::getMore([
-            ['page', 1],
-            ['data', ''],
-            ['uid', ''],
-            ['uip', ''],
-            ['mobile', ''],
-        ]);
-        $where = [];
-        if(!empty($post["uid"])){
-            $where["l.uid"] = $post["uid"];
-        }
-        if(!empty($post["uip"])){
-            $udata = (new UserModel)->where("uip",$post["uip"])->find();
-            if(!empty($udata)){
-                $where["l.uid"] = $udata["uid"];
-            }
-        }
-        if(!empty($post["mobile"])){
-            $udata = (new UserModel)->where("mobile",$post["mobile"])->find();
-            if(!empty($udata)){
-                $where["l.uid"] = $udata["uid"];
-            }
-        }
-        $data = (new UserLogin)
-                ->alias("l")
-                ->field("l.*,u.uip,u.mobile,u.nickname")
-                ->leftJoin("user u","u.uid = l.uid")
-                ->where($where)
-                ->when(!empty($post["data"]), function ($query) use ($post) {
-                    if ($post['data'] == "lately7") {
-                        $sTime = date('Y-m-d', strtotime('-7 day'));
-                        $eTime = date('Y-m-d');
-                        $query->whereBetweenTime('l.time', $sTime, $eTime);
-                    } else if ($post['data'] == "lately30") {
-                        $sTime = date('Y-m-d', strtotime('-30 day'));
-                        $eTime = date('Y-m-d');
-                        $query->whereBetweenTime('l.time', $sTime, $eTime);
-                    } else if ($post['data'] == "today") {
-                        $query->whereTime('l.time', 'today');
-                    } else if ($post['data'] == "yesterday") {
-                        $query->whereTime('l.time', 'yesterday');
-                    } else if ($post['data'] == "month") {
-                        $query->whereMonth('l.time');
-                    } else if ($post['data'] == "year") {
-                        $query->whereYear('l.time');
-                    } else {
-                        $split = explode('-', $post['data']);
-                        if (count($split) == 2) {
-                            $sTime = $split[0];
-                            $eTime = $split[1];
-                            $query->whereBetweenTime('l.time', $sTime, $eTime);
-                        }
-                    }
-                })
-                ->page((int)$post["page"], $pageSize)
-                ->order("l.id desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new UserLogin)
-                ->alias("l")
-                ->where($where)
-                ->when(!empty($post["data"]), function ($query) use ($post) {
-                    if ($post['data'] == "lately7") {
-                        $sTime = date('Y-m-d', strtotime('-7 day'));
-                        $eTime = date('Y-m-d');
-                        $query->whereBetweenTime('l.time', $sTime, $eTime);
-                    } else if ($post['data'] == "lately30") {
-                        $sTime = date('Y-m-d', strtotime('-30 day'));
-                        $eTime = date('Y-m-d');
-                        $query->whereBetweenTime('l.time', $sTime, $eTime);
-                    } else if ($post['data'] == "today") {
-                        $query->whereTime('l.time', 'today');
-                    } else if ($post['data'] == "yesterday") {
-                        $query->whereTime('l.time', 'yesterday');
-                    } else if ($post['data'] == "month") {
-                        $query->whereMonth('l.time');
-                    } else if ($post['data'] == "year") {
-                        $query->whereYear('l.time');
-                    } else {
-                        $split = explode('-', $post['data']);
-                        if (count($split) == 2) {
-                            $sTime = $split[0];
-                            $eTime = $split[1];
-                            $query->whereBetweenTime('l.time', $sTime, $eTime);
-                        }
-                    }
-                })
-                ->order("l.id desc")
-                ->count();
-                
-        foreach($data as $k=>$v){
-            $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-            $data[$k]["title"] = "{$v['nickname']}[{$v['uip']}]进行了登录";
-        }
-
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-
-    /**
-     * 清理一个月之前的登录数据
-     */
-    public function delMonthLoginLog()
-    {
-        $time = strtotime('- 1 month');
-        (new UserLogin)->where('time', '<', $time)->delete();
-        return app('json')->success('清理成功');
-    }
-
-}

app/system/controller/v1/Member.php

@@ -1,761 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// |
-// +----------------------------------------------------------------------
-// | Date: 2020-08-31 20:43
-// +----------------------------------------------------------------------
-
-namespace app\system\controller\v1;
-
-
-use app\BaseController;
-use app\lib\OrderLib;
-use app\model\api\PayTrade;
-use app\model\api\UserShop as UserShopModel;
-use app\model\api\Order as OrderModel;
-use app\model\api\ActivityOrder as ActivityOrderModel;
-use library\utils\weixinPay as wxpayApi;
-use app\model\api\User as UserModel;
-use app\model\api\UserDetail as UserDetailModel;
-use app\model\api\UserScoreDetail as UserScoreDetailModel;
-use library\services\UtilService;
-use app\Request;
-use think\facade\Db;
-
-class Member extends BaseController
-{
-    /**
-     * 会员列表
-     * @param Request $request
-     * @return mixed
-     */
-    public function list(Request $request)
-    {
-        $pageSize = 50;
-        $post =  UtilService::getMore([
-            ['page',1],
-            ['nickname',''],
-            ['uip',''],
-            ['uid',''],
-            ['parent_uid',''],
-            ['parent_uip',''],
-            ['mobile',''],
-            ['status',''],
-            ['time',[]],
-        ],$request);
-        $where = [];
-        //创建时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $where[]=["u.regtime","between","{$startTime},{$endTime}"];
-        }
-        if(!empty($post['nickname'])){
-            $where[]=["u.nickname","like","%{$post['nickname']}%"];
-        }
-        if(!empty($post['uid'])){
-            $where[]=["u.uid","=",$post['uid']];
-        }
-        if(!empty($post['mobile'])){
-            $where[]=["u.mobile","=",$post['mobile']];
-        }
-        if(!empty($post['uip'])){
-            $where[]=["u.uip","=",$post['uip']];
-        }
-        if(!empty($post['parent_uid'])){
-            $where[]=["u.parent_uid","=",$post['parent_uid']];
-        }else if(!empty($post['parent_uip'])){
-            $m  = Db::name("user")->where("uip",$post['parent_uip'])->find();
-            if(!empty($m)) {
-                $where[]=["u.parent_uid","=",$m['uid']];
-            }
-        }
-        if(in_array((string)$post["status"],['1','0','-1'])){
-            $where[]=["u.status","=",(int)$post["status"]];
-        }
-        $data = (new UserModel)
-                ->field("u.uid,u.uip,u.nickname,u.regtime,u.score,u.money,u.status,u.avatar,u.ercode,u.mobile,u.parent_uid"
-                        . ",s.id as shop_id,s.name as shop_name,s.lx_name as shop_lx_name,s.address as shop_address,s.tel as shop_tel,s.longitude as shop_longitude,s.latitude as shop_latitude,IFNULL(s.is_show,0) as shop_is_show"
-                        . ",p.nickname as p_nickname,p.mobile as p_mobile,p.uip as p_uip"
-                        . ",(select count(*) from table_user where parent_uid = u.uid) as branchCount")
-                ->alias("u")
-                ->leftJoin("user p","p.uid = u.parent_uid")
-                ->leftJoin("user_shop s","s.uid = u.uid")
-                ->where($where)
-                ->page((int)$post["page"], (int)$pageSize)
-                ->order("u.uid","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new UserModel)->alias("u")->where($where)->count();
-        $data = empty($data)?[]:$data;
-        foreach($data as $k=>$v){
-            $data[$k]["regtime"] = date("Y-m-d H:i:s",$v["regtime"]);
-            $data[$k]["mobile"]  = empty($v["mobile"])?"未绑定":$v["mobile"];
-            $data[$k]["p_mobile"]  = empty($v["mobile"])?"未绑定":$v["p_mobile"];
-        }
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post["page"],
-        ]);
-    }
-
-    /**
-     * 编辑
-     */
-    public function save(Request $request){
-        $post = UtilService::getMore([
-            ['uid','0'],
-            ['status',''],
-            
-            ['shop_name',''],
-            ['shop_tel',''],
-            ['shop_lx_name',''],
-            ['shop_address',''],
-            ['shop_longitude',''],
-            ['shop_latitude',''],
-            ['shop_is_show',''],
-        ],$request);
-        $uid = (int)$post["uid"];
-        if(empty($uid)){
-            return app('json')->fail("参数错误");
-        }
-        unset($post["uid"]);
-        $r=0;
-        if(!in_array((string)$post["status"],['1','-1'])){
-            return app('json')->success("状态错误");
-        }
-        //开启门店
-        $shopData = (new UserShopModel)->where("uid",$uid)->find();
-        $shopSave=[
-            "name"      => $post["shop_name"],
-            "tel"       => $post["shop_tel"],
-            "lx_name"   => $post["shop_lx_name"],
-            "address"   => $post["shop_address"],
-            "longitude" => $post["shop_longitude"],
-            "latitude"  => $post["shop_latitude"],
-            "is_show"   => $post["shop_is_show"]==1?1:0,
-        ];
-        if($shopSave["is_show"]==1){
-            if(empty($shopSave["name"])){
-                return app('json')->fail("请输入门店名称");
-            }
-            if(empty($shopSave["tel"])){
-                return app('json')->fail("请输入门店联系电话");
-            }
-            if(empty($shopSave["lx_name"])){
-                return app('json')->fail("请输入门店联系人");
-            }
-            if(empty($shopSave["address"])){
-                return app('json')->fail("请输入门店地址");
-            }
-            if(empty($shopData)){
-                $shopSave["time"]=time();
-                (new UserShopModel)->insert($shopSave);
-            }else{
-                (new UserShopModel)->where("id",$shopData["id"])->update($shopSave);
-            }
-        }else{
-            if(!empty($shopData)){
-                (new UserShopModel)->where("id",$shopData["id"])->update($shopSave);
-            }
-        }
-        //用户信息
-        $save=[];
-        $save["status"] = $post["status"];
-        $r = (new UserModel)->where("uid",$uid)->update($save);
-        return app('json')->success("数据保存成功");
-    }
-
-    /**
-     * 会员收益明细列表
-     * @param Request $request
-     * @return mixed
-     */
-    public function moneyDetail (Request $request)
-    {
-        $pageSize = 50;
-        $post     = UtilService::getMore(
-            [
-                ['page', '1'],
-                ['uid', '0'],
-                ['uip', ''],
-                ['mobile', ''],
-                ['time', []],
-                ['type', ''],
-                ['code', ''],
-            ], $request
-        );
-        $where    = [];
-        if (!empty($post['uid'])){
-            $where[]=["d.uid","=",$post['uid']];
-        }
-        if (!empty($post['uip'])) {
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=["d.uid","=",$m['uid']];
-            }
-        }
-        if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["d.uid","=",$m['uid']];
-            }
-        }
-        $startTime = "";
-        $endTime = "";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-           $startTime =  strtotime($post['time'][0]);
-           $endTime = strtotime($post['time'][1]);
-           $where[]=["d.time","between","{$startTime},{$endTime}"];
-        }
-        if (!empty($post['type']) && in_array(strval($post['type']), ["1","-1"])) {
-            $where[]=["d.type","=",$post['type']];
-        }
-        if(!empty($post['code']) && $post['code']!="all"){
-            $where[]=["d.code","=",$post['code']];
-        }
-        $data = (new UserDetailModel)
-                ->alias("d")
-                ->field("d.*,u.mobile,u.uip")
-                ->leftJoin("user u", "u.uid = d.uid")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("d.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new UserDetailModel)->alias("d")->where($where)->count();
-        foreach($where as $k=>$v){
-            if($v[0]=="d.type"){
-                array_splice($where,$k,1);
-            }
-        }
-        //收入
-        $inWhere = $where;
-        $inWhere[]=["d.type","=",1];
-        $inTotal   = (new UserDetailModel)->alias("d")->where($inWhere)->sum("d.into");
-        //支出
-        $outWhere = $where;
-        $outWhere[]=["d.type","=",-1];
-        $outTotal  = (new UserDetailModel)->alias("d")->where($outWhere)->sum("d.into");     
-        $result = UtilService::getParam(
-            [
-                'id',
-                'uid',
-                'uip',
-                'mobile',
-                'title',
-                'content',
-                'type',
-                'into',
-                'money',
-                ['time', 'time', 'date("Y-m-d H:i:s",$1)'],
-            ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-            'inTotal'   => empty($inTotal) ? 0 : floatval($inTotal),
-            'outTotal'  => empty($outTotal)? 0 : floatval($outTotal),
-        ]);
-    }
-    /**
-     * 收益增/减
-     * @param Request $request
-     */
-    public function moneyDetailSave(Request $request)
-    {
-        $post = UtilService::getMore([
-            ['uid', '', 'empty', '参数错误'],
-            ['type', '1'],
-            ['into', '0', 'gt|0', '输入值错误'],
-            ['othen', ''],
-        ], $request);
-        $userData = (new UserModel)->where("uid",$post["uid"])->find();
-        if(empty($userData)){
-            $userData = (new UserModel)->where("uip",$post["uip"])->find();
-            if(empty($userData)){
-                return app('json')->fail('用户不存在，请输入正确的用户uid');
-            }
-        }
-        if(!in_array((string)$post["type"],["1","-1"])){
-            return app('json')->fail('请选择增减');
-        }
-        if ($post['type'] == 1)
-            $bool = (new UserDetailModel)->adminAddMoney($userData['uid'], $post['into'],  $request->adminInfo['id'],$post['othen']);
-
-        if ($post['type'] == -1)
-            $bool = (new UserDetailModel)->adminCutMoney($userData['uid'], $post['into'],  $request->adminInfo['id'],$post['othen']);
-
-        if ($bool)
-            return app('json')->success('操作成功');
-        else
-            return app('json')->fail('操作失败');
-    }
-    
-    /**
-     * 钻石收益明细列表
-     * @param Request $request
-     * @return mixed
-     */
-    public function scoreDetail (Request $request)
-    {
-        $pageSize = 50;
-        $post     = UtilService::getMore(
-            [
-                ['page', '1'],
-                ['uid', '0'],
-                ['uip', ''],
-                ['mobile', ''],
-                ['type', ''],
-                ['code', ''],
-                ['time', []],
-            ], $request
-        );
-        $where    = [];
-        if (!empty($post['uid'])){
-            $where[]=["d.uid","=",$post['uid']];
-        }else if (!empty($post['uip'])) {
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=["d.uid","=",$m['uid']];
-            }
-        }else if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["d.uid","=",$m['uid']];
-            }
-        }
-        $startTime = "";
-        $endTime = "";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-           $startTime =  strtotime($post['time'][0]);
-           $endTime = strtotime($post['time'][1]);
-           $where[]=["d.time","between","{$startTime},{$endTime}"];
-        }
-        if (!empty($post['type']) && in_array(strval($post['type']), ["1","-1"])) {
-            $where[]=["d.type","=",$post['type']];
-        }
-        if (!empty($post['code'])) {
-            $where[]=["d.code","=",$post['code']];
-        }
-        $data = (new UserScoreDetailModel)
-                ->alias("d")
-                ->field("d.*,u.mobile,u.uip")
-                ->leftJoin("user u", "u.uid = d.uid")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("d.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new UserScoreDetailModel)->alias("d")->where($where)->count();
-        foreach($where as $k=>$v){
-            if($v[0]=="d.type"){
-                array_splice($where,$k,1);
-            }
-        }
-        //收入
-        $inWhere = $where;
-        $inWhere[]=["d.type","=",1];
-        $inTotal   = (new UserScoreDetailModel)->alias("d")->where($inWhere)->sum("d.v");
-        //支出
-        $outWhere = $where;
-        $outWhere[]=["d.type","=",-1];
-        $outTotal  = (new UserScoreDetailModel)->alias("d")->where($outWhere)->sum("d.v");
-        $result = UtilService::getParam(
-            [
-                'id',
-                'uid',
-                'uip',
-                'mobile',
-                'title',
-                'content',
-                'type',
-                ['into','v'],
-                'money',
-                ['time', 'time', 'date("Y-m-d H:i:s",$1)'],
-            ], $data);
-
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-            'inTotal'   => empty($inTotal) ? 0 : floatval($inTotal),
-            'outTotal'  => empty($outTotal)? 0 : floatval($outTotal),
-        ]);
-    }
-    /**
-     * 积分增/减
-     * @param Request $request
-     */
-    public function scoreDetailSave(Request $request)
-    {
-        $post = UtilService::getMore([
-            ['uid', '', 'empty', '参数错误'],
-            ['type', '1'],
-            ['into', '0', 'gt|0', '输入值错误'],
-            ['othen', ''],
-        ], $request);
-        $userData = (new UserModel)->where("uid",$post["uid"])->find();
-        if(empty($userData)){
-            $userData = (new UserModel)->where("uip",$post["uid"])->find();
-            if(empty($userData)){
-                return app('json')->fail('用户不存在，请输入正确的用户uid');
-            }
-        }
-        if ($post['type'] == 1)
-            $bool = (new UserScoreDetailModel)->adminAddMoney($userData['uid'], intval($post['into']),  $request->adminInfo['id'],$post['othen']);
-
-        if ($post['type'] == -1)
-            $bool = (new UserScoreDetailModel)->adminCutMoney($userData['uid'], intval($post['into']),  $request->adminInfo['id'],$post['othen']);
-
-        if ($bool)
-            return app('json')->success('操作成功');
-        else
-            return app('json')->fail('操作失败');
-    }
-    
-    /**
-     * 获取会员数据
-     * @param Request $request
-     * @return mixed
-     */
-    public function getItem(Request $request)
-    {
-        $post   = UtilService::getMore([
-            ['uid', 1],
-        ]);
-        $data = (new UserModel)
-                ->alias("u")
-                ->field("u.uid,u.mobile,u.nickname,u.avatar,u.status,u.regtime,u.lasttime,u.parent_uid.p.nickname as parent_nickname")
-                ->leftJoin("user p","p.uid = u.parent_uid")
-                ->where("u.uid",$post["uid"])
-                ->find()
-                ->toArray();
-        if(!empty($data)){
-            $data["regtime"] = date("Y-m-d H:i:s",$data["regtime"]);
-            $data["lasttime"] = date("Y-m-d H:i:s",$data["lasttime"]);
-        }
-        return app('json')->success(empty($data) ? [] : $data);
-    }
-    public function shopSave(Request $request){
-        $post = UtilService::getMore([
-            ['id','','empty','参数错误'],
-            ['name','','empty','请输入名称'],
-            ['tel','','empty','请输入联系电话'],
-            ['lx_name','','empty','请输入联系人'],
-            ['address','','empty','请输入门店地址'],
-            ['longitude',''],
-            ['latitude',''],
-            ['is_show',''],
-        ],$request);
-        $id = (int)$post["id"];
-        if(empty($id)){
-            return app('json')->fail("参数错误");
-        }
-        unset($post["id"]);
-        $shopSave=[
-            "name"      => $post["name"],
-            "tel"       => $post["tel"],
-            "address"   => $post["address"],
-            "lx_name"   => $post["lx_name"],
-            "longitude" => $post["longitude"],
-            "latitude"  => $post["latitude"],
-            "is_show"   => $post["is_show"]==1?1:0,
-        ];
-        if(empty($shopSave["name"])){
-            return app('json')->fail("请输入门店名称");
-        }
-        if(empty($shopSave["tel"])){
-            return app('json')->fail("请输入门店联系电话");
-        }
-        if(empty($shopSave["address"])){
-            return app('json')->fail("请输入门店地址");
-        }
-        if(empty($shopSave["lx_name"])){
-            return app('json')->fail("请输入门店联系人");
-        }
-        (new UserShopModel)->where("id",$id)->update($shopSave);
-        return app('json')->success("数据保存成功");
-        
-    }
-    public function shopList(Request $request){
-        $pageSize = 50;
-        $post     = UtilService::getMore(
-            [
-                ['page', '1'],
-                ['uid', ''],
-                ['is_show', ''],
-                ['mobile', ''],
-                ['name', ''],
-                ['pageSize', ''],
-            ], $request);
-        $where    = [];
-        if(!empty($post["pageSize"]) && $post["pageSize"]>50){
-            $pageSize = (int)$post["pageSize"];
-        }
-        //用户
-        if (!empty($post['uid'])){
-            $where[]=["t.uid","=",$post['uid']];
-        }else if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["t.uid","=",$m['uid']];
-            }
-        }
-        if(is_numeric($post['is_show']) && in_array((string)$post['is_show'],['0','1'])) {
-            $where[]=["t.is_show","=",(int)$post['is_show']];
-        }
-         if(!empty($post['name'])){
-            $where[]=["t.name","like","%{$post['name']}%"];
-        }
-        $data = (new UserShopModel)
-                ->alias("t")
-                ->field("t.*,u.nickname as nickname,u.uip as uip")
-                ->leftJoin("user u" , "u.uid = t.uid")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("t.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new UserShopModel)->alias("t")->where($where)->count();
-        $result = UtilService::getParam(
-            [
-                'id',
-                'uid',
-                'nickname',
-                'name',
-                'area',
-                'address',
-                'tel',
-                'lx_name',
-                'longitude',
-                "latitude",
-                'is_show',
-                ['time', 'time', function($item){
-                    return empty($item) ? "--" : date("Y-m-d H:i:s",$item);
-                }],
-            ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-        
-    }
-    
-    
-    /**
-     * 支付任务列表
-     * @param \app\model\api\Request $request
-     */
-    public function payTradeList(Request $request){
-        $pageSize = 50;
-        $post     = UtilService::getMore(
-            [
-                ['page', '1'],
-                ['uid', ''],
-                ['uip', ''],
-                ['status', ''],
-                ['mobile', ''],
-                ['type', ''],
-                ['pay_no', ''],
-                ['order_id', ''],
-                ['time', []],
-            ], $request);
-        $where    = [];
-        //用户
-        if (!empty($post['uid'])){
-            $where[]=["t.uid","=",$post['uid']];
-        }else if (!empty($post['uip'])) {
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=["t.uid","=",$m['uid']];
-            }
-        }else if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["t.uid","=",$m['uid']];
-            }
-        }
-        if(is_numeric($post['status']) && in_array((string)$post['status'],['0','1'])) {
-            $where[]=["t.status","=",(int)$post['status']];
-        }
-        if(!empty($post['pay_type']) && in_array($post['pay_type'],['wxpay','system'])) {
-            $where[]=["t.pay_type","=",$post['pay_type']];
-        }
-        if(!empty($post['type']) && in_array($post['type'],['pro','ip','activity'])) {
-            $where[]=["t.type","=",$post['type']];
-        }
-        if(!empty($post['pay_no'])){
-            $where[]=["t.pay_no","=",$post['pay_no']];
-        }
-        if(!empty($post['order_id'])){
-            $where[]=["t.order_id","=",$post['order_id']];
-        }
-        
-        $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}"];
-        }
-        $data = (new PayTrade)
-                ->alias("t")
-                ->field("t.*,u.nickname as nickname,u.uip as uip,a.username as admin_name")
-                ->leftJoin("user u" , "u.uid = t.uid")
-                ->leftJoin("admin a", "a.id  = t.admin_id")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("t.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new PayTrade)->alias("t")->where($where)->count();
-        $result = UtilService::getParam(
-            [
-                'id',
-                'uid',
-                'uip',
-                'nickname',
-                "admin_id",
-                "admin_name",
-                'pay_no',
-                'out_trade_no',
-                'pay_no',
-                'order_id',
-                'pay_type',
-                'type',
-                'money',
-                'content',
-                "d_json",
-                'status',
-                'mono',
-                ['time', 'time', function($item){
-                    return empty($item) ? "--" : date("Y-m-d H:i:s",$item);
-                }],
-                ['pay_time' , 'pay_time', function($item){
-                    return empty($item) ? "--" : date("Y-m-d H:i:s",$item);
-                }],
-                ['pay_json', 'pay_json', function($item){
-                    if(empty($item)){
-                        return "";
-                    }
-                    $payData = json_decode($item,true);
-                    return $payData;
-                }],
-            ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    /**
-     * 搜索交易数据
-     * @param Request $request
-     */
-    public function searchPayTrade(Request $request){
-        $post     = UtilService::getMore(
-            [
-                ['id', '','empty',''],
-            ], $request);
-        $data = (new PayTrade)->where("id",$post["id"])->find();
-        if(empty($data)){
-            return app("json")->fail("数据不存在");
-        }
-        if($data["status"]==1 && !empty($data["pay_json"])){
-            return app("json")->success("交易支付成功", json_decode($data["pay_json"],true));
-        }
-        $out_trade_no = $data["out_trade_no"];
-        //微信支付
-        if($data["pay_type"]=="wxpay"){
-            $wxpay = new wxpayApi();
-            $res = $wxpay->searchOrder($out_trade_no);
-            if(empty($res)){
-                return app("json")->fail("查询失败:".$wxpay->errorMsg);
-            }
-            $resAr = json_decode($res,true);
-            if(empty($resAr) || !is_array($resAr)){
-                return app("json")->fail("查询失败");
-            }
-            if(empty($resAr["trade_state"])){
-                return app("json")->fail("查询状态错误");
-            }
-            if($resAr["trade_state"]=="NOTPAY"){
-                return app("json")->fail("未支付");
-            }
-            if($resAr["trade_state"]=="REFUND"){
-                return app("json")->fail("转入退款");
-            }
-            if($resAr["trade_state"]=="CLOSED"){
-                return app("json")->fail("已关闭");
-            }
-            if($resAr["trade_state"]=="REVOKED"){
-                return app("json")->fail("已撤销（付款码支付）");
-            }
-            if($resAr["trade_state"]=="USERPAYING"){
-                return app("json")->fail("用户支付中（付款码支付）");
-            }
-            if($resAr["trade_state"]=="PAYERROR"){
-                return app("json")->fail("支付失败(其他原因，如银行返回失败)");
-            }
-            if($resAr["trade_state"]=="ACCEPT"){
-                return app("json")->fail("已接收，等待扣款");
-            }
-            if($resAr["trade_state"]=="SUCCESS"){
-                if(empty($resAr["amount"]) || empty($resAr["amount"]["total"])){
-                    return app("json")->fail("交易支付成功，但是查询金额信息");
-                }
-                $returnData = [
-                    'totalMoney' =>$resAr["amount"]["total"]/100,
-                    'payMoney'   =>empty($resAr["amount"]["payer_total"])?'未返回':$resAr["amount"]["payer_total"]/100,
-                    'payTradeNo' =>$resAr["transaction_id"],
-                    'outTradeNo' =>$resAr["out_trade_no"],
-                    "tradeStatus"=>$resAr["trade_state"],
-                    "payTime"    =>$resAr["success_time"],
-                ];
-                $save=[
-                    "status"=>1,
-                    "pay_json"=>json_encode($returnData),
-                ];
-                if(!empty($returnData["payTime"])){
-                    $save["pay_time"] = strtotime($returnData["payTime"]);
-                }
-                (new PayTrade)->where("id",$post["id"])->save($save);
-                $saveOrderModel = null;
-                if(!empty($data["o_id"]) && $data["status"]!=1){
-                    if($data["type"]=="activity"){
-                        $saveOrderModel = new ActivityOrderModel();
-                    }
-                    if($data["type"]=="pro" || $data["type"]=="ip"){
-                        $saveOrderModel = new OrderModel();
-                    }
-                }
-                if(!empty($saveOrderModel)){
-                    $orderData = $saveOrderModel->where("id",$data["o_id"])->find();
-                    if(!empty($orderData) && $orderData["status"]<1){
-                        $saveOrderModel->where("id",$data["o_id"])->update(["status"=>1,"pay_time"=>$save["pay_time"]]);
-                    }
-                }
-                return app("json")->success("交易支付成功",$returnData);
-            }
-            return app("json")->fail("支付状态未知");
-        }
-        return app("json")->fail("查询失败");
-    }
-
-    
-    
-}

app/system/controller/v1/News.php

@@ -1,73 +0,0 @@
-<?php
-declare (strict_types = 1);
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\Request;
-use library\services\UtilService;
-use app\model\api\News as NewsModel;
-
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | 展示信息管理
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:53
-// +----------------------------------------------------------------------
-
-class News extends  BaseController{
-    /**
-     * 公告列表
-     * @param Request $request
-     */
-    public function list(Request $request){
-        $post = UtilService::getMore([
-            ['status', ''],
-        ],$request);
-        $where=[];
-        if(is_numeric($post["status"]) && in_array((string)$post["status"],["0","1"])){
-            $where["status"] = $post["status"];
-        }
-        $data = (new NewsModel)->where($where)->order("time","desc")->select()->toArray();
-        foreach($data as $k=>$v){
-            $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-        }
-        return app("json")->success(["list"=>$data]);
-    }
-    /**
-     * 公告添加
-     * @param Request $request
-     */
-    public function add(Request $request){
-        $post = UtilService::getMore([
-            ['id', ''],
-            ['title', '','empty','请输入标题'],
-            ['content', '','empty','请输入内容'],
-            ['status', '','is_numeric','参数错误'],
-        ],$request);
-        $save = [];
-        $save["title"]   = $post["title"];
-        $save["content"] = $post["content"];
-        $save["status"]  = empty($post["status"]) ? 0 : 1;
-        $save["time"]    = time();
-        if(empty($post["id"])){
-            (new NewsModel)->insert($save);
-        }else{
-            (new NewsModel)->where("id",$post["id"])->update($save);
-        }
-        return app("json")->success("操作成功");
-    }
-    /**
-     * 公告删除
-     * @param Request $request
-     */
-    public function del(Request $request){
-        $post = UtilService::getMore([
-            ['id', '','empty','参数错误'],
-        ],$request);
-        (new NewsModel)->where("id",$post["id"])->delete();
-        return app("json")->success("删除成功");
-    }
-}

app/system/controller/v1/Order.php

@@ -1,710 +0,0 @@
-<?php
-declare (strict_types=1);
-
-namespace app\system\controller\v1;
-
-use app\BaseController;
-use app\model\api\MemberDetail;
-//use app\model\api\Express;
-use app\model\api\Order as OrderModel;
-use app\model\api\ActivityOrder as ActivityOrderModel;
-use app\model\api\OrderInfo;
-use app\model\api\OrderMono;
-
-use app\Request;
-use library\services\UtilService;
-use library\utils\Region;
-use think\db\exception\DbException;
-use think\Exception;
-use think\facade\Db;
-use function GuzzleHttp\Psr7\str;
-
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// |
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:53
-// +----------------------------------------------------------------------
-
-class Order extends BaseController
-{
-
-    /**
-     * 获取订单数据
-     * @param Request $request
-     * @return mixed
-     * @throws DbException
-     */
-    public function list(Request $request)
-    {
-        $pageSize = 50;
-        $post = UtilService::getMore(
-            [
-                ['page', 1],
-                ['uid',0],
-                ['uip',''],
-                ['order_id', ''],
-                ['status',''],
-                ['type',''],
-                ['shop_id',''],
-                ['is_ip_buy',''],
-                ['mobile',''],
-                ['name',''],
-                ['tel',''],
-                ['time',[]],
-            ], $request
-        );
-        $where = [];
-        if(!empty($post['uid'])){
-            $where[]=["o.uid","=",$post['uid']];
-        }else if(!empty($post['uip'])){
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=["o.uid","=",$m['uid']];
-            }
-        }else if(!empty($post['mobile'])){
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["o.uid","=",$m['uid']];
-            }
-        }
-        if(!empty($post['order_id'])){
-            $where[]=["o.order_id","=",$post['order_id']];
-        }
-        if(in_array((string)$post['status'],["0","1","2","3","-1"])){
-            $where[]=["o.status","=",(int)$post['status']];
-        }
-        if($post['is_ip_buy']!="" && in_array((string)$post['is_ip_buy'],["0","1"])){
-            $where[]=["o.is_ip_buy","=",(int)$post['is_ip_buy']];
-        }
-        if($post['type']!="" && in_array((string)$post['type'],["shop","send"])){
-            $where[]=["o.type","=",$post['type']];
-        }
-        if(!empty($post['name'])){
-            $where[]=["o.name","=",$post['name']];
-        }
-        if(!empty($post['tel'])){
-            $where[]=["o.tel","=",$post['tel']];
-        }
-        if(!empty($post['shop_id'])){
-            $where[]=["o.shop_id","=",$post['shop_id']];
-        }
-        //创建时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $where[]=["o.time","between","{$startTime},{$endTime}"];
-        }
-        $order = new OrderModel;
-        $data  = $order
-                ->alias("o")
-                ->field("o.*,u1.mobile,u1.uip,u1.nickname")
-                ->leftJoin("user u1","u1.uid = o.uid")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("o.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = $order->alias("o")->where($where)->count();
-        $result = UtilService::getParam([
-            "id",
-            "order_id",
-            "uid",
-            "uip",
-            "mobile",
-            "nickname",
-            
-            "total_money",
-            "all_money",
-            "pay_money",
-            "postage",
-            "name",
-            "tel",
-            "address",
-            "coupon_money",
-            "is_ip_buy",
-            "status",
-            "score",
-            "give_score",
-            "mono",
-            "express_num",
-            "type",
-            "shop_id",
-            "content",
-            ['time', 'time', 'date("Y-m-d H:i:s",$1)'],
-            ['pay_time', 'pay_time', function ($item) {
-                return empty($item) ? "-" : date('Y-m-d H:i:s', $item);
-            }],
-            ['fa_time', 'fa_time', function ($item) {
-                return empty($item) ? "-" : date('Y-m-d H:i:s', $item);
-            }],
-            ['ok_time', 'ok_time', function ($item) {
-                return empty($item) ? "-" : date('Y-m-d H:i:s', $item);
-            }],
-            
-        ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    /**
-     * 搜索统计
-     */
-    public function total(Request $request)
-    {
-        $post = UtilService::getMore(
-            [
-                ['uid',0],
-                ['uip',''],
-                ['mobile',''],
-                ['tel',''],
-                ['name',''],
-                ['type',''],
-                ['shop_id',''],
-                ['order_id', ''],
-                ['status',''],
-                ['is_ip_buy',''],
-                ['time',[]],
-            ], $request
-        );
-        $order       = new OrderModel;
-        $totalWhere = [];
-        if(!empty($post['uid'])){
-            $totalWhere[]=["uid","=",$post['uid']];
-        }else if(!empty($post['uip'])){
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $totalWhere[]=["uid","=",$m['uid']];
-            }
-        }else if(!empty($post['mobile'])){
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $totalWhere[]=["uid","=",$m['uid']];
-            }
-        }
-        if(!empty($post['order_id'])){
-            $totalWhere[]=["order_id","=",$post['order_id']];
-        }
-        if($post['is_ip_buy']!="" && in_array((string)$post['is_ip_buy'],["0","1"])){
-            $totalWhere[]=["is_ip_buy","=",(int)$post['is_ip_buy']];
-        }
-        if($post['type']!="" && in_array((string)$post['type'],["shop","send"])){
-            $totalWhere[]=["type","=",$post['type']];
-        }
-        if(in_array((string)$post['status'],["0","1","2","3","-1"])){
-            $totalWhere[]=["status","=",$post['status']];
-        }
-        if(!empty($post['name'])){
-            $totalWhere[]=["name","=",$post['name']];
-        }
-        if(!empty($post['tel'])){
-            $totalWhere[]=["tel","=",$post['tel']];
-        }
-        if(!empty($post['shop_id'])){
-            $totalWhere[]=["shop_id","=",$post['shop_id']];
-        }
-        //创建时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $totalWhere[]=["time","between","{$startTime},{$endTime}"];
-        }
-        foreach($totalWhere as $k=>$v){
-            if($v[0]=="status"){
-                array_splice($totalWhere,$k,1);
-            }
-        }
-        //全部
-        $orderCount = $order->where($totalWhere)->count();
-        //待支付
-        $waitPayWhere   = $totalWhere;
-        $waitPayWhere[] = ["status","=","0"];
-        $waitPayCount   = $order->where($waitPayWhere)->count();
-        //待发货
-        $waitSendWhere    = $totalWhere;
-        $waitSendWhere[]  = ["status","=",1];
-        $waitSendCount    = $order->where($waitSendWhere)->count();
-        //待收货
-        $waitAcceptWhere    = $totalWhere;
-        $waitAcceptWhere[]  = ["status","=",2];
-        $waitAcceptCount    = $order->where($waitAcceptWhere)->count();
-        //已完成
-        $okWhere    = $totalWhere;
-        $okWhere[]  = ["status","=",3];
-        $okCount    = $order->where($okWhere)->count();
-        
-        
-        //已取消
-        $closeWhere    = $totalWhere;
-        $closeWhere[]  = ["status","=",-1];
-        $closeCount    = $order->where($closeWhere)->count();
-        return app('json')->success([
-            'orderCount' => $orderCount,
-            'waitPayCount'=> $waitPayCount,
-            'waitSendCount' => $waitSendCount,
-            'waitAcceptCount'=>$waitAcceptCount,
-            'okCount'=>$okCount,
-            'closeCount' => $closeCount,
-        ]);
-    }
-
-    /**
-     * 订单详情
-     * @param Request $request
-     */
-    public function info(Request $request)
-    {
-        [$id] = UtilService::getMore([
-            ['id', '', 'empty', '参数错误'],
-        ], $request, true);
-        $oData = (new OrderModel)
-                ->alias("o")
-                ->field("o.*,u1.mobile,u1.uip,u1.nickname")
-                ->leftJoin("user u1","u1.uid = o.uid")
-                ->where("o.id",$id)
-                ->find();
-        if (empty($oData)) {
-            return app('json')->fail('找不到订单号');
-        }
-        //主订单数据
-        $data                 = [];
-        $data['id']           = $oData['id'];
-        $data['order_id']     = $oData['order_id'];
-        $data['uid']          = $oData['uid'];
-        $data['mobile']       = $oData['mobile'];
-        $data['nickname']     = $oData['nickname'];
-        $data['total_money']  = $oData['total_money'];
-        $data['all_money']    = $oData['all_money'];
-        $data['pay_money']    = $oData['pay_money'];
-        $data['postage']      = $oData['postage'];
-        $data['name']         = $oData['name'];
-        $data['tel']          = $oData['tel'];
-        $data['address']      = $oData['address'];
-        $data['coupon_money'] = $oData['coupon_money'];
-        $data['is_ip_buy']    = $oData['is_ip_buy'];
-        $data['status']       = $oData['status'];
-        $data['score']        = $oData['score'];
-        $data['give_score']   = $oData['give_score'];
-        $data['mono']         = $oData['mono'];
-        $data['express_num']  = $oData['express_num'];
-        $data['content']      = $oData['content'];
-        $data['time']         = date('Y-m-d H:i:s', $oData['time']);
-        $data['pay_time']     = empty($oData['pay_time'])?"-":date('Y-m-d H:i:s', $oData['pay_time']);
-        $data['fa_time']      = empty($oData['fa_time'])?"-":date('Y-m-d H:i:s', $oData['fa_time']);
-        $data['ok_time']      = empty($oData['ok_time'])?"-":date('Y-m-d H:i:s', $oData['ok_time']);
-        //订单详情
-        $info                 = (new OrderInfo)->where("o_id", $oData['id'])->select()->toArray();
-        $infoData             = [];
-        foreach ($info as $v) {
-            $d               = [];
-            $d['id']         = $v['id'];
-            $d['p_id']       = $v['p_id'];
-            $d['title']      = $v['title'];
-            $d['img']        = $v['img'];
-            $d['count']      = $v['count'];
-            $d['price']      = $v['price'];
-            $d['money']      = $v['money'];
-            $d['is_ip_buy']  = $v['is_ip_buy'];
-            $d['give_score'] = $v['give_score'];
-            $infoData[] = $d;
-        }
-        $data['info'] = $infoData;
-        return app('json')->success($data);
-    }
-    
-    /**
-     * 订单备注记录
-     * @param Request $request
-     * @return mixed
-     */
-    public function log(Request $request){
-        $pageSize = 20;
-        $post     = UtilService::getMore([
-            ['page', 1],
-            ['o_id', '','empty','参数错误']
-        ], $request);
-        $where=[];
-        $where['m.o_id'] = $post['o_id'];
-        $where['m.code'] = "shop";
-        $pageCount = (new OrderMono)->alias("m")->where($where)->count();
-        $data = (new OrderMono)
-                ->alias("m")
-                ->where($where)
-                ->order("id","desc")
-                ->page((int)$post["page"], $pageSize)
-                ->select()
-                ->toArray();
-        $data = empty($data)?[]:$data;
-        foreach($data as $k=>$v){
-            $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-        }
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    /**
-     * 进行发货
-     * @global type $_A
-     * @param Request $request
-     */
-    public function fahuo(Request $request) {
-        $post = UtilService::getMore([
-            ['id','','empty','参数错误'],
-            ['express_num',''],
-            ['remark',''],
-        ],$request);
-        $oData = (new OrderModel)->where("id",$post["id"])->where("status",1)->find();
-        if (empty($oData)) {
-            return app('json')->fail('当前订单不可发货');
-        }
-        if($oData["type"]=='send' && empty($post["express_num"])){
-            return app('json')->fail('请输入物流单号');
-        }
-        $r = (new OrderModel)->where("id",$post["id"])->update([
-            "status"=>2,
-            "express_num"=>$post["express_num"],
-            "fa_time"=>time(),
-        ]);
-        if(!$r){
-            return app('json')->fail('操作失败');
-        }
-        $saveData=[];
-        
-        $saveData[]=[
-            "o_id"=>$oData["id"],
-            "order_id"=>$oData["order_id"],
-            "mono"=>$oData["type"]=='send'?"确定发货, 物流单号:" . $post["express_num"]:"门店确定清点完毕",
-            "time"=>time(),
-            "admin_id"=>$request->adminInfo['id'],
-            "admin_name"=>$request->adminInfo['name'],
-            "type"=>1,
-            "code"=>"shop",
-        ];
-        if(!empty($post["remark"])){
-            $saveData[]=[
-                "o_id"=>$oData["id"],
-                "order_id"=>$oData["order_id"],
-                "mono"=>$post["remark"],
-                "time"=>time(),
-                "admin_id"=>$request->adminInfo['id'],
-                "admin_name"=>$request->adminInfo['name'],
-                "type"=>1,
-                "code"=>"shop",
-            ];
-        }
-        (new OrderMono)->insertAll($saveData);
-        return app('json')->success('操作成功');
-    }
-    /**
-     * 订单备注提交
-     * @param Request $request
-     * @return mixed
-     */
-    public function mono(Request $request) {
-       $post = UtilService::getMore([
-            ['remark','','empty','请输入备注内容'],
-            ['id','','empty','参数错误']
-        ],$request);
-        $oData = (new OrderModel)->where("id",$post["id"])->find();
-        if (empty($oData)) {
-            return app('json')->fail('订单不存在');
-        }
-        (new OrderMono)->insert([
-            "o_id"=>$oData["id"],
-            "order_id"=>$oData["order_id"],
-            "mono"=>$post["remark"],
-            "time"=>time(),
-            "admin_id"=>$request->adminInfo['id'],
-            "admin_name"=>$request->adminInfo['name'],
-            "type"=>1,
-            "code"=>"shop",
-        ]);
-        return app('json')->success('处理成功');
-    }
-    
-    /**
-     * 获取活动订单数据
-     * @param Request $request
-     * @return mixed
-     * @throws DbException
-     */
-    public function activityList(Request $request)
-    {
-        $pageSize = 50;
-        $post = UtilService::getMore(
-            [
-                ['page', 1],
-                ['uid',0],
-                ['activity_id',''],
-                ['uip',''],
-                ['order_id', ''],
-                ['status',''],
-                ['mobile',''],
-                ['time',[]],
-            ], $request
-        );
-        $where = [];
-        if(!empty($post['uid'])){
-            $where[]=["o.uid","=",$post['uid']];
-        }else if(!empty($post['uip'])){
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=["o.uid","=",$m['uid']];
-            }
-        }else if(!empty($post['mobile'])){
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=["o.uid","=",$m['uid']];
-            }
-        }
-        if(!empty($post['activity_id'])){
-            $where[]=["o.activity_id","=",$post['activity_id']];
-        }
-        if(!empty($post['order_id'])){
-            $where[]=["o.order_id","=",$post['order_id']];
-        }
-        if(in_array((string)$post['status'],["0","1","-1"])){
-            $where[]=["o.status","=",(int)$post['status']];
-        }
-        //创建时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $where[]=["o.time","between","{$startTime},{$endTime}"];
-        }
-        $order = new ActivityOrderModel;
-        $data  = $order
-                ->alias("o")
-                ->field("o.*,u1.mobile,u1.uip,u1.nickname,a.title as activity_title,a.imgs as activity_imgs")
-                ->leftJoin("user u1","u1.uid = o.uid")
-                ->leftJoin("activity a","a.id = o.activity_id")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("o.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = $order->alias("o")->where($where)->count();
-        $result = UtilService::getParam([
-            "id",
-            "order_id",
-            "uid",
-            "uip",
-            "mobile",
-            "nickname",
-            "total_money",
-            "all_money",
-            "pay_money",
-            "status",
-            "activity_id",
-            "activity_title",
-            "activity_imgs",
-            ['activity_imgs', 'activity_imgs', function ($item) {
-                return empty($item) ? [] : explode(",", $item);
-            }],
-            ['time', 'time', 'date("Y-m-d H:i:s",$1)'],
-            ['pay_time', 'pay_time', function ($item) {
-                return empty($item) ? "-" : date('Y-m-d H:i:s', $item);
-            }],
-            ['data', 'data', function ($item) {
-                $jsonData = empty($item)?[]: unserialize($item);
-                return $jsonData;
-            }],
-        ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    /**
-     * 搜索统计
-     */
-    public function activityTotal(Request $request)
-    {
-        $post = UtilService::getMore(
-            [
-                ['uid',0],
-                ['uip',''],
-                ['mobile',''],
-                ['order_id', ''],
-                ['status',''],
-                ['activity_id',''],
-                ['time',[]],
-            ], $request
-        );
-        $order       = new ActivityOrderModel;
-        $totalWhere = [];
-        if(!empty($post['uid'])){
-            $totalWhere[]=["uid","=",$post['uid']];
-        }else if(!empty($post['uip'])){
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $totalWhere[]=["uid","=",$m['uid']];
-            }
-        }else if(!empty($post['mobile'])){
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $totalWhere[]=["uid","=",$m['uid']];
-            }
-        }
-        if(!empty($post['activity_id'])){
-            $totalWhere[]=["activity_id","=",$post['activity_id']];
-        }
-        if(!empty($post['order_id'])){
-            $totalWhere[]=["order_id","=",$post['order_id']];
-        }
-        if(in_array((string)$post['status'],["0","1","-1"])){
-            $totalWhere[]=["status","=",$post['status']];
-        }
-        //创建时间
-        $startTime="";
-        $endTime="";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-            $startTime = strtotime($post['time'][0]);
-            $endTime = strtotime($post['time'][1]);
-            $totalWhere[]=["time","between","{$startTime},{$endTime}"];
-        }
-        foreach($totalWhere as $k=>$v){
-            if($v[0]=="status"){
-                array_splice($totalWhere,$k,1);
-            }
-        }
-        //全部
-        $orderCount = $order->where($totalWhere)->count();
-        //待支付
-        $waitPayWhere   = $totalWhere;
-        $waitPayWhere[] = ["status","=","0"];
-        $waitPayCount   = $order->where($waitPayWhere)->count();
-        //待发货
-        $waitSendWhere    = $totalWhere;
-        $waitSendWhere[]  = ["status","=",1];
-        $waitSendCount    = $order->where($waitSendWhere)->count();
-        //已取消
-        $closeWhere    = $totalWhere;
-        $closeWhere[]  = ["status","=",-1];
-        $closeCount    = $order->where($closeWhere)->count();
-        return app('json')->success([
-            'orderCount' => $orderCount,
-            'waitPayCount'=> $waitPayCount,
-            'waitSendCount' => $waitSendCount,
-            'closeCount' => $closeCount,
-        ]);
-    }
-
-    /**
-     * 活动订单详情
-     * @param Request $request
-     */
-    public function activityInfo(Request $request)
-    {
-        [$id] = UtilService::getMore([
-            ['id', '', 'empty', '参数错误'],
-        ], $request, true);
-        $oData = (new ActivityOrderModel)
-                ->alias("o")
-                ->field("o.*,u1.mobile,u1.uip,u1.nickname,a.title as activity_title,a.imgs as activity_imgs")
-                ->leftJoin("user u1","u1.uid = o.uid")
-                ->leftJoin("activity a","a.id = o.activity_id")
-                ->where("o.id",$id)
-                ->find();
-        if (empty($oData)) {
-            return app('json')->fail('找不到订单号');
-        }
-        //主订单数据
-        $data                   = [];
-        $data['id']             = $oData['id'];
-        $data['order_id']       = $oData['order_id'];
-        $data['uid']            = $oData['uid'];
-        $data['mobile']         = $oData['mobile'];
-        $data['nickname']       = $oData['nickname'];
-        $data['total_money']    = $oData['total_money'];
-        $data['all_money']      = $oData['all_money'];
-        $data['pay_money']      = $oData['pay_money'];
-        $data['status']         = $oData['status'];
-        $data['activity_id']    = $oData['activity_id'];
-        $data['activity_title'] = $oData['activity_title'];
-        $data['activity_imgs']  = empty($oData['activity_imgs'])?[]: explode(",", $oData['activity_imgs']);
-        $data['status']         = $oData['status'];
-        $data['time']           = date('Y-m-d H:i:s', $oData['time']);
-        $data['pay_time']       = empty($oData['pay_time'])?"-":date('Y-m-d H:i:s', $oData['pay_time']);
-        //订单详情
-        $data['info']         = empty($oData["data"]) ? [] : unserialize($oData["data"]);
-        return app('json')->success($data);
-    }
-    
-    /**
-     * 活动订单备注记录
-     * @param Request $request
-     * @return mixed
-     */
-    public function activityLog(Request $request){
-        $pageSize = 20;
-        $post     = UtilService::getMore([
-            ['page', 1],
-            ['o_id', '','empty','参数错误']
-        ], $request);
-        $where=[];
-        $where['m.o_id'] = $post['o_id'];
-        $where['m.code'] = "activity";
-        $pageCount = (new OrderMono)->alias("m")->where($where)->count();
-        $data = (new OrderMono)
-                ->alias("m")
-                ->where($where)
-                ->order("id","desc")
-                ->page((int)$post["page"], $pageSize)
-                ->select()
-                ->toArray();
-        $data = empty($data)?[]:$data;
-        foreach($data as $k=>$v){
-            $data[$k]["time"] = date("Y-m-d H:i:s",$v["time"]);
-        }
-        return app('json')->success([
-            'list'      => $data,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    /**
-     * 报名订单备注提交
-     * @param Request $request
-     * @return mixed
-     */
-    public function activityMono(Request $request) {
-       $post = UtilService::getMore([
-            ['remark','','empty','请输入备注内容'],
-            ['id','','empty','参数错误']
-        ],$request);
-        $oData = (new ActivityOrderModel)->where("id",$post["id"])->find();
-        if (empty($oData)) {
-            return app('json')->fail('订单不存在');
-        }
-        (new OrderMono)->insert([
-            "o_id"=>$oData["id"],
-            "order_id"=>$oData["order_id"],
-            "mono"=>$post["remark"],
-            "time"=>time(),
-            "admin_id"=>$request->adminInfo['id'],
-            "admin_name"=>$request->adminInfo['name'],
-            "type"=>1,
-            "code"=>"activity",
-        ]);
-        return app('json')->success('处理成功');
-    }
-}

app/system/controller/v1/Tx.php

@@ -1,311 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// |
-// +----------------------------------------------------------------------
-// | Date: 2020-11-08 12:56
-// +----------------------------------------------------------------------
-
-namespace app\system\controller\v1;
-
-
-use app\BaseController;
-use app\model\api\Tx as TxModel;
-use app\model\api\User as UserModel;
-use app\model\api\Sys as SysModel;
-use app\model\api\Bank as BankModel;
-use app\model\api\UserDetail as UserDetailModel;
-use app\model\api\TuserDetail as TuserDetailModel;
-use think\db\exception\DbException;
-use think\facade\Db;
-use app\Request;
-use library\services\UtilService;
-
-class Tx extends BaseController
-{
-    /**
-     * 初始化
-     * @param Request $request
-     * @return type
-     */
-    public function init(Request $request)
-    {
-        [$isTuser] = UtilService::getMore(
-            [
-                ['isTuser',0],
-            ], $request,true);
-        $isTuser = empty($isTuser) ? 0 : 1;
-        $where=[];
-        //获取全部提现
-        $allTx = (new TxModel)->where($where)->count();
-        $noTx  = (new TxModel)->where($where)->where('status', 0)->count();
-        $yeTx  = (new TxModel)->where($where)->where('status', 1)->count();
-        $errTx = (new TxModel)->where($where)->where('status', -1)->count();
-        
-        $bankList = (new BankModel)
-//                ->where("status",1)
-                ->order("seq","desc")
-                ->order("id","desc")
-                ->select()
-                ->toArray();
-        $bankList = empty($bankList)?[]:$bankList;
-        
-        
-        return app('json')->success([
-            'all_tx' => $allTx,
-            'no_tx'  => $noTx,
-            'yes_tx' => $yeTx,
-            'err_tx' => $errTx,
-            'bankList'=>$bankList,
-        ]);
-    }
-
-    /**
-     * 获取提现列表
-     * @param Request $request
-     */
-    public function list(Request $request)
-    {
-        $pageSize = 50;
-        $post     = UtilService::getMore(
-            [
-                //公共参数
-                ['page', 1],
-                ['status', ''],
-                ['bank_type', ''],
-                ['time',[]],
-                //手机用户
-                ['mobile',''],
-                ['uip', ''],
-                ['uid', ''],
-            ], $request
-        );
-        $where=[];
-        //公共参数
-        if(is_numeric($post['status'])) {
-            $where[]=['t.status',"=",$post['status']];
-        }
-        if(!empty($post['bank_type'])) {
-            $where[]=['t.bank_type',"=",$post['bank_type']];
-        }
-        //提现时间
-        $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}"];
-        }
-        //用户uid
-        if(is_numeric($post['uid'])) {
-            $where[]=['t.uid',"=",$post['uid']];
-        }else if (!empty($post['uip'])) {
-            $m  = Db::name("user")->where("uip",$post['uip'])->find();
-            if(!empty($m)) {
-                $where[]=['t.uid',"=",$m['uid']];
-            }
-        }else if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where[]=['t.uid',"=",$m['uid']];
-            }
-        }
-        $data = (new TxModel)
-                ->alias("t")
-                ->field("t.*,u.uip,u.nickname,u.mobile,a.username as admin_name,b.name as bank_type_name")
-                ->leftJoin("user u", "u.uid = t.uid")
-                ->leftJoin("admin a", "a.id = t.admin_id")
-                ->leftJoin("bank b", "b.code = t.bank_type")
-                ->where($where)
-                ->page((int)$post["page"], $pageSize)
-                ->order("t.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new TxModel)->alias("t")->where($where)->count();
-        $result = UtilService::getParam([
-            "id",
-            "uid",
-            "bank_type",
-            "bank_type_name",
-            "bank_num",
-            "bank_name",
-            "bank_ad",
-            "money",
-            "tx_money",
-            "hand_money",
-            "status",
-            ["time", "time", "date('Y-m-d H:i:s',$1)"],
-            "admin_id",
-            "admin_remark",
-            ["admin_time", "admin_time", function ($item) {
-                return empty($item) ? '' : date('Y-m-d H:i:s', $item);
-            }],
-            "admin_name",
-            "mobile",
-            "nickname",
-            "uip",
-        ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    /**
-     * 提现处理
-     * @param Request $request
-     */
-    public function dealSub(Request $request)
-    {
-        $post   = UtilService::getMore(
-            [
-                ['id', '', 'empty', '参数错误'],
-                ['mono'],
-                ['type', 0],
-            ], $request);
-        $txData = (new TxModel)->where('id', $post['id'])->find();
-        if (empty($txData)) {
-            return app('json')->fail('数据不存在');
-        }
-        if ($txData['status']!=0) {
-            return app('json')->success( '当前提现申请已处理');
-        }
-        //提现通过
-        if ($post['type'] == 1) {
-            (new TxModel)
-                ->where('id', $post['id'])
-                ->save([
-                    'status'        => 1,
-                    'admin_remark' => empty($post['mono'])?"已确认打款":$post['mono'],
-                    'admin_time'    => time(),
-                    'admin_id'     => $request->adminInfo['id'],
-                ]);
-            return app('json')->success('操作成功');
-        }
-        //提现驳回
-        if ($post['type'] == -1) {
-            //添加事件回滚
-            try{
-                Db::startTrans();
-                (new TxModel)
-                    ->where('id', $post['id'])
-                    ->save([
-                        'status'        => -1,
-                        'admin_remark' => empty($post['mono'])?"已驳回申请":$post['mono'],
-                        'admin_time'    => time(),
-                        'admin_id'     => $request->adminInfo['id'],
-                    ]);
-                if($txData["uid"]>0){
-                    //用户提现驳回
-                    (new UserDetailModel)->txRefundMoney($txData['uid'],$txData["money"],$txData["id"]);
-                }else{
-                    return app("json")->fail("提现用户不存在");
-                }
-                Db::commit();
-                return app('json')->success('操作成功');
-            }catch(DbException $db){
-                Db::rollback();
-                return app("json")->fail("操作失败");
-            }
-        }
-    }
-    /**
-     * 获取订单数据
-     * @param Request $request
-     */
-    public function down(Request $request)
-    {
-        $pageSize = 40000;
-        $post     = UtilService::getMore(
-            [
-                ['page', 1],
-                ['mobile',''],
-                ['status', ''],
-                ['bank_type', ''],
-                ['uid', ''],
-                ['time',[]],
-            ], $request
-        );
-        $where    = [];
-        $where=[];
-
-        if(is_numeric($post['status'])) {
-            $where['t.status'] = $post['status'];
-        }
-        if(is_numeric($post['uid'])) {
-            $where['t.uid'] = $post['uid'];
-        }
-
-        if (!empty($post['mobile'])) {
-            $m  = Db::name("user")->where("mobile",$post['mobile'])->find();
-            if(!empty($m)) {
-                $where['t.uid'] = $m['uid'];
-            }
-        }
-        
-        if(!empty($post['bank_type'])) {
-            $where['t.bank_type'] = $post['bank_type'];
-        }
-        $startTime = "";
-        $endTime = "";
-        if(!empty($post['time'][0]) && !empty($post['time'][1])) {
-           $startTime =  strtotime($post['time'][0]);
-           $endTime = strtotime($post['time'][1]);
-        }
-        $data = (new TxModel)
-                ->alias("t")
-                ->field("t.*,u.uip,u.nickname,u.mobile,a.username as admin_name")
-                ->leftJoin("user u", "u.uid = t.uid")
-                ->leftJoin("admin a", "a.id = t.admin_id")
-                ->where($where)
-                ->when((!empty($startTime) && !empty($endTime)),function($query)use($startTime,$endTime){
-                    $query->whereBetween("t.time","{$startTime},{$endTime}");
-                })
-                ->limit(0,30000)
-                ->order("t.id","desc")
-                ->select()
-                ->toArray();
-        $pageCount = (new TxModel)
-                ->alias("t")
-                ->leftJoin("user u", "u.uid = t.uid")
-                ->leftJoin("admin a", "a.id = t.admin_id")
-                ->where($where)
-                ->when((!empty($startTime) && !empty($endTime)),function($query)use($startTime,$endTime){
-                    $query->whereBetween("t.time","{$startTime},{$endTime}");
-                })
-                ->count();
-        $result = UtilService::getParam([
-            "id",
-            "uid",
-            "bank_type",
-            "bank_num",
-            "bank_name",
-            "bank_ad",
-            "money",
-            "tx_money",
-            "hand_money",
-            "status",
-            ["time", "time", "date('Y-m-d H:i:s',$1)"],
-            "admin_id",
-            "admin_remark",
-            ["admin_time", "admin_time", function ($item) {
-                return empty($item) ? '' : date('Y-m-d H:i:s', $item);
-            }],
-            "admin_name",
-            "mobile",
-            "nickname",
-            "uip",
-        ], $data);
-        return app('json')->success([
-            'list'      => $result,
-            'pageCount' => $pageCount,
-            'pageSize'  => $pageSize,
-            'page'      => $post['page'],
-        ]);
-    }
-    
-}

app/system/route/activity.php

@@ -1,24 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | [ 礼物管理 ]
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:52
-// +----------------------------------------------------------------------
-use think\facade\Route;
-
-//@活动管理
-Route::group('activity', function () {
-    //@活动列表
-    Route::rule('list', 'activity/list');
-    //@添加编辑活动
-    Route::rule('add', 'activity/add');
-    
-})->middleware([
-    \app\system\middleware\AllowOriginMiddleware::class,
-    \app\system\middleware\AdminAuthTokenMiddleware::class,
-    \app\system\middleware\AdminCkeckRoleMiddleware::class
-]);

app/system/route/circle.php

@@ -1,24 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | [ 礼物管理 ]
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:52
-// +----------------------------------------------------------------------
-use think\facade\Route;
-
-//@圈子管理
-Route::group('circle', function () {
-    //@动态列表
-    Route::rule('list', 'circle/list');
-    //@审核动态
-    Route::rule('editStatus', 'circle/editStatus');
-    
-})->middleware([
-    \app\system\middleware\AllowOriginMiddleware::class,
-    \app\system\middleware\AdminAuthTokenMiddleware::class,
-    \app\system\middleware\AdminCkeckRoleMiddleware::class
-]);

app/system/route/goods.php

@@ -1,42 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | [ 礼物管理 ]
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:52
-// +----------------------------------------------------------------------
-use think\facade\Route;
-
-//@商城管理
-Route::group('goods', function () {
-    
-    //@商品列表
-    Route::rule('list', 'goods/list');
-    //@添加编辑商品
-    Route::rule('add', 'goods/add');
-    //@删除商品
-    Route::rule('del', 'goods/del');
-    
-    //@优惠券列表
-    Route::rule('coupon', 'goods/coupon');
-    //@添加编辑优惠券
-    Route::rule('couponAdd', 'goods/couponAdd');
-    //@删除优惠券
-    Route::rule('couponDel', 'goods/couponDel');
-    
-    
-    
-    //@商品分类
-    Route::rule('cate', 'goods/cate');
-    //@添加商品分类
-    Route::rule('cateAdd', 'goods/cateAdd');
-    //@删除商品分类
-    Route::rule('cateDel', 'goods/cateDel');
-})->middleware([
-    \app\system\middleware\AllowOriginMiddleware::class,
-    \app\system\middleware\AdminAuthTokenMiddleware::class,
-    \app\system\middleware\AdminCkeckRoleMiddleware::class
-]);

app/system/route/goods_1.php

@@ -1,42 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | [ 礼物管理 ]
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:52
-// +----------------------------------------------------------------------
-use think\facade\Route;
-
-//@商城管理
-Route::group('goods', function () {
-    
-    //@商品列表
-    Route::rule('list', 'goods/list');
-    //@添加编辑商品
-    Route::rule('add', 'goods/add');
-    //@删除商品
-    Route::rule('del', 'goods/del');
-    
-    //@优惠券列表
-    Route::rule('coupon', 'goods/coupon');
-    //@添加编辑优惠券
-    Route::rule('couponAdd', 'goods/couponAdd');
-    //@删除优惠券
-    Route::rule('couponDel', 'goods/couponDel');
-    
-    
-    
-    //@商品分类
-    Route::rule('cate', 'goods/cate');
-    //@添加商品分类
-    Route::rule('cateAdd', 'goods/cateAdd');
-    //@删除商品分类
-    Route::rule('cateDel', 'goods/cateDel');
-})->middleware([
-    \app\system\middleware\AllowOriginMiddleware::class,
-    \app\system\middleware\AdminAuthTokenMiddleware::class,
-    \app\system\middleware\AdminCkeckRoleMiddleware::class
-]);

app/system/route/news.php

@@ -1,25 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | 
-// +----------------------------------------------------------------------
-// | Date: 2020-09-06 21:52
-// +----------------------------------------------------------------------
-use think\facade\Route;
-
-//@展示信息管理
-Route::group('news', function () {
-    //@公告列表
-    Route::post('list','news/list');
-    //@公告添加
-    Route::post('add','news/add');
-    //@公告删除
-    Route::post('del','news/del');
-})->middleware([
-    \app\system\middleware\AllowOriginMiddleware::class,
-    \app\system\middleware\AdminAuthTokenMiddleware::class,
-    \app\system\middleware\AdminCkeckRoleMiddleware::class,
-]);

app/system/route/order.php

@@ -12,18 +12,6 @@ use think\facade\Route;
 
 //@订单管理
 Route::group('order', function () {
-    //@订单统计
-    Route::rule('total',"Order/total");
-    //@订单列表
-    Route::rule('list','Order/list');
-    //@订单详情
-    Route::rule('info','Order/info');
-    //@订单记录
-    Route::rule('log','Order/log');
-    //@添加备注
-    Route::rule('mono','Order/mono');
-    //@订单发货
-    Route::rule('fahuo','Order/fahuo');
     //@模板订单统计
     Route::rule('showTemplateTotal',"Order/showTemplateTotal");
     //@模板订单列表

app/system/route/tx.php

@@ -1,28 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | 
-// +----------------------------------------------------------------------
-// | Date: 2020-09-05 09:21
-// +----------------------------------------------------------------------
-
-use think\facade\Route;
-//@提现列表
-Route::group('tx', function () {
-    //@提现列表初始化
-    Route::rule('init','tx/init');
-    //@列表
-    Route::rule('list', 'tx/list');
-    //@提现处理
-    Route::rule('dealSub','tx/dealSub');
-    //@提现下载
-    Route::rule('down','tx/down');
-
-})->middleware([
-    \app\system\middleware\AllowOriginMiddleware::class,
-    \app\system\middleware\AdminAuthTokenMiddleware::class,
-    \app\system\middleware\AdminCkeckRoleMiddleware::class
-]);

library/lib/expInfo.php

@@ -14,7 +14,7 @@ namespace library\lib;
 class  expInfo {
     //host
     private $host = "https://ali-deliver.showapi.com/";
-    private $appcode = '9c5ae0cea941f9b7aa4a2cb6969a';
+    private $appcode = '';
 
 
     /**