1234

app/admin/controller/Business.php

@@ -19,9 +19,9 @@ class Business extends BaseController
         if($company==""){
             return error_show(1002,"参数company不能为空");
         }
-        $company_type = isset($this->post['company_type']) && $this->post['company_type'] !==""? trim($this->post['company_type']):"";
-        if($company_type==""){
-            return error_show(1002,"参数company_type不能为空");
+        $type = isset($this->post['type']) && $this->post['type'] !==""? trim($this->post['type']):"";
+        if($type==""){
+            return error_show(1002,"参数type不能为空");
         }
         $inv_code = isset($this->post['inv_code']) && $this->post['inv_code'] !==""? trim($this->post['inv_code']):"";
         if($inv_code==""){
@@ -78,29 +78,44 @@ class Business extends BaseController
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $status = isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"0";
-        $data =[
-            "company"=>$company,
-            "inv_code"=>$inv_code,
-            "company_type"=>$company_type,
-            "inv_legaler"=>$inv_legaler,
-            "inv_time"=>$inv_time,
-            "inv_addr"=>$inv_addr,
-            "inv_bank"=>$inv_bank,
-            "inv_bankNo"=>$inv_bankNo,
-            "contactor"=>$contactor,
-            "mobile"=>$mobile,
-            "addr"=>$addr,
-            "creater"=>$creater,
-            "createrid"=>$createrid,
-            "inv_scope"=>$inv_scope,
-            "license_img"=>$license_img,
-            "status"=>$status,
-            "is_del"=>0,
-            "addtime"=>date("Y-m-d H:i:s"),
-            "updatetime"=>date("Y-m-d H:i:s")
-        ];
-        $datainfo = Db::name('business')->insert($data);
-        return  $datainfo? error_show(0,"新建成功"):error_show(1004,"新建失败");
+        Db::startTrans();
+       try{
+
+           $data =[
+               "company"=>$company,
+               "inv_code"=>$inv_code,
+               "type"=>$type,
+               "inv_legaler"=>$inv_legaler,
+               "inv_time"=>$inv_time,
+               "inv_addr"=>$inv_addr,
+               "inv_bank"=>$inv_bank,
+               "inv_bankNo"=>$inv_bankNo,
+               "contactor"=>$contactor,
+               "mobile"=>$mobile,
+               "addr"=>$addr,
+               "creater"=>$creater,
+               "createrid"=>$createrid,
+               "inv_scope"=>$inv_scope,
+               "license_img"=>$license_img,
+               "status"=>$status,
+               "is_del"=>0,
+               "addtime"=>date("Y-m-d H:i:s"),
+               "updatetime"=>date("Y-m-d H:i:s")
+           ];
+           $datainfo = Db::name('business')->insert($data);
+           if($datainfo){
+               Db::commit();
+               return error_show(0,"新建成功");
+           }else{
+               Db::rollback();
+               return error_show(1004,"新建失败");
+           }
+       }catch (\Exception $e) {
+       }
+           Db::rollback();
+           return error_show(1005, $e->getMessage());
+
+
     }
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']):"1";
@@ -129,8 +144,15 @@ class Business extends BaseController
         $count = Db::name('business') ->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('business')->where($where)->page($page,$size)->field("company,status,creater,addtime")->order("addtime desc")->select();
-        return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
+        $list = Db::name('business')->where($where)->page($page,$size)->field("company,status,creater,addtime,type")->order("addtime desc")->select();
+        $data=[];
+        foreach ($list as $value){
+            $info = Db::name('company_type')->where(['id'=>$value['type'],"is_del"=>0])->find();
+            $data['companytype']=isset($info['company_type'])?$info['company_type']:"";
+            $data[]=$value;
+        }
+
+        return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
     }
     public function edit(){
        $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
@@ -145,9 +167,9 @@ class Business extends BaseController
         if($company==""){
             return error_show(1002,"参数company不能为空");
         }
-        $company_type = isset($this->post['company_type']) && $this->post['company_type'] !==""? trim($this->post['company_type']):"";
-        if($company_type==""){
-            return error_show(1002,"参数company_type不能为空");
+        $type = isset($this->post['type']) && $this->post['type'] !==""? trim($this->post['type']):"";
+        if($type==""){
+            return error_show(1002,"参数type不能为空");
         }
         $inv_code = isset($this->post['inv_code']) && $this->post['inv_code'] !==""? trim($this->post['inv_code']):"";
         if($inv_code==""){
@@ -204,30 +226,45 @@ class Business extends BaseController
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $status = isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"0";
-        $data = [
-            "id"=>$id,
-            "company"=>$company,
-            "inv_code"=>$inv_code,
-            "company_type"=>$company_type,
-            "creater"=>$creater,
-            "createrid"=>$createrid,
-            "inv_legaler"=>$inv_legaler,
-            "inv_time"=>$inv_time,
-            "inv_addr"=>$inv_addr,
-            "inv_bank"=>$inv_bank,
-            "inv_bankNo"=>$inv_bankNo,
-            "contactor"=>$contactor,
-            "mobile"=>$mobile,
-            "addr"=>$addr,
-            "inv_scope"=>$inv_scope,
-            "license_img"=>$license_img,
-            "status"=>$status,
-            "is_del"=>0,
-            "addtime"=>date("Y-m-d H:i:s"),
-            "updatetime"=>date("Y-m-d H:i:s")
-        ];
-        $info = Db::name('business')->save($data);
-        return $info ? error_show(0,"更新成功") : error_show(1002,"更新失败");
+        Db::startTrans();
+        try{
+            $data = [
+                "id"=>$id,
+                "company"=>$company,
+                "inv_code"=>$inv_code,
+                "type"=>$type,
+                "creater"=>$creater,
+                "createrid"=>$createrid,
+                "inv_legaler"=>$inv_legaler,
+                "inv_time"=>$inv_time,
+                "inv_addr"=>$inv_addr,
+                "inv_bank"=>$inv_bank,
+                "inv_bankNo"=>$inv_bankNo,
+                "contactor"=>$contactor,
+                "mobile"=>$mobile,
+                "addr"=>$addr,
+                "inv_scope"=>$inv_scope,
+                "license_img"=>$license_img,
+                "status"=>$status,
+                "is_del"=>0,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+            $info = Db::name('business')->save($data);
+            if($info){
+                Db::commit();
+                return error_show(0,"更新成功");
+            }else{
+                Db::rollback();
+                return error_show(1002,"更新失败");
+            }
+        }catch (\Exception $e) {
+            Db::rollback();
+            return error_show(1005, $e->getMessage());
+        }
+
+
+
     }
     public function del(){
         $id = $this->post['id'] && $this->post['id'] !=="" ? intval($this->post['id']) :"";
@@ -275,6 +312,23 @@ class Business extends BaseController
         if($tod==""){
             return error_show(1002,"未找到数据");
         }
+        $info = Db::name('company_type')->where(['id'=>$tod['type'],"is_del"=>0])->find();
+
+        $tod['companytype']=isset($info['company_type'])?$info['company_type']:"" ;
+
         return app_show(0,"获取成功",$tod);
     }
+    public function title(){
+        $where = [["is_del","=",0]];
+        $company_type = isset($this->post['company_type']) && $this->post['company_type'] !=="" ? intval($this->post['company_type']):"";
+        if($company_type!=""){
+            $where[]=['company_type',"like","%$company_type%"];
+        }
+        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
+        if($status!=""){
+            $where[]=['status',"=",$status];
+        }
+        $list = Db::name('company_type')->where($where)->select();
+        return app_show(0,"获取成功",$list);
+    }
 }

app/admin/controller/Cat.php

@@ -16,7 +16,7 @@ public function __construct(App $app)
     $this->post=$this->request->post();
 }
 public function list(){
-    $where=[];
+    $where=[["is_del","=",0]];
     $pid =  isset($this->post['pid']) &&$this->post['pid']!=="" ?intval($this->post['pid']): "0";
     $where[]=["pid","=",$pid];
 
@@ -34,7 +34,7 @@ public function list(){
 public function plist(){
     $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']) :"1";
     $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']) :"10";
-    $where =[];
+    $where =[["is_del","=",0]];
     $cat_name=isset($this->post['cat_name']) && $this->post['cat_name'] !==""? trim($this->post['cat_name']) :"";
     if($cat_name!==""){
         $where[]=['cat_name',"like","%$cat_name%"];
@@ -53,6 +53,23 @@ public function plist(){
     $list = Db::name('cat')->where($where)->page($page, $size)->select();
     return app_show(0, "获取成功", ['list' => $list, 'count' => $count]);
 }
+public function title(){
+    $where =[["is_del","=",0]];
+    $cat_name=isset($this->post['cat_name']) && $this->post['cat_name'] !==""? trim($this->post['cat_name']) :"";
+    if($cat_name!==""){
+        $where[]=['cat_name',"like","%$cat_name%"];
+    }
+    $pid=isset($this->post['pid']) && $this->post['pid'] !==""? intval($this->post['pid']) :"";
+    if($pid!==""){
+        $where[]=['pid',"=",$pid];
+    }
+    $status=isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']) :"";
+    if($status!==""){
+        $where[]=['status',"=",$status];
+    }
+    $list = Db::name('cat')->where($where)->select();
+    return app_show(0, "获取成功", $list);
+}
 public function create()
 {
     $cat_name = isset($this->post['cat_name']) && $this->post['cat_name'] !== "" ? trim($this->post['cat_name']) : "";
@@ -63,7 +80,7 @@ public function create()
     if ($pid === "") {
         return error_show(1002, "参数pid不能为空");
     }
-    //$level = isset($this->post['level']) && $this->post['level'] !== "" ? intval($this->post['level']) : "";
+    $cat_desc = isset($this->post['cat_desc']) && $this->post['cat_desc'] !== "" ? trim($this->post['cat_desc']) : "";
 
     $levl=Db::name('cat')->where(['id'=>$pid])->find();
     $level =1;
@@ -100,16 +117,16 @@ public function create()
             "rate" => $rate,
             "weight" => $weight,
             "status" => $status,
+            "cat_desc"=>$cat_desc,
+            "is_del"=>0,
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s")
         ];
         $datainfo = Db::name('cat')->insert($data,true);
         $vat =[];
-
         if ($datainfo>0) {
             $stx = ["order_code"=>$pid,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd($this->post['token'],$stx,"sxd",$status,$stx);
-
             $spc =[];
             $spc['cat_id']=$datainfo;
             $spc['exam_status']=0;
@@ -119,7 +136,6 @@ public function create()
             $spc['is_del']=0;
             $spc['addtime']=date("Y-m-d H:i:d");
             $spc['updatetime']=date("Y-m_d H:i:s");
-
             $vpn = Db::name('cat_spec')->insert($spc,true);
             if ($vpn == "") {
                 Db::rollback();
@@ -133,9 +149,7 @@ public function create()
                 $item['addtime']=date("Y-m-d H:i:s");
                 $vat[] = $item;
             }
-
             $vp = Db::name('cat_specs')->insertAll($vat);
-          // var_dump(Db::name('cat_specs')->getLastSql());
             if ($vp==0) {
                 Db::rollback();
                 return error_show(1005, "新建失败");
@@ -156,7 +170,6 @@ public function create()
 public function edit(){
     $id = isset($this->post['id']) && $this->post['id'] !==""? intval($this->post['id']) :"";
     $idinfo = Db::name('cat')->where(['id'=>$id])->find();
-  //  var_dump($idinfo);
     if($idinfo==""){
         return error_show(1002,"未找到商品数据");
     }
@@ -168,6 +181,8 @@ public function edit(){
     if($pid==""){
         return error_show(1002,"参数pid不能为空");
     }
+    $cat_desc = isset($this->post['cat_desc']) && $this->post['cat_desc'] !=="" ? trim($this->post['cat_desc']) :"";
+
     $specs_id = isset($this->post['specs_id']) && $this->post['specs_id'] !== "" ? $this->post['specs_id'] : [];
     if (empty($specs_id)) {
         return error_show(1002, "参数specs_id不能为空");
@@ -194,6 +209,8 @@ public function edit(){
             "level"=>$level,
             "weight"=>$weight,
             "status"=>$status,
+            "cat_desc"=>$cat_desc,
+            "is_del"=>0,
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $strinfo = Db::name('cat')->where(['id'=>$id])->save($str);
@@ -203,17 +220,16 @@ public function edit(){
 
             $spc =[];
             $vp = Db::name('cat_spec')->where(['cat_id'=>$idinfo['id'],'is_del'=>0])->find();
+          $str ="";
             if($vp!=false){
-                //var_dump($vp);
                 isset($vp['id']) && $vp['id'] !== "" ? $spc['id'] = $vp['id'] : '';
             $spc['cat_id']=$idinfo['id'];
             $spc['exam_status']=0;
             $spc['status']=0;
-           // $spc['creater']=$creater;
-          //  $spc['createrid']=$createrid;
             $spc['is_del']=0;
-            //$spc['addtime']=date("Y-m-d H:i:d");
             $spc['updatetime']=date("Y-m_d H:i:s");
+            $str=$vp['id'];
+                $vpn = Db::name('cat_spec')->save($spc);
         }else{
 
                 $spc['cat_id']=$idinfo['id'];
@@ -224,29 +240,45 @@ public function edit(){
                 $spc['is_del']=0;
                 $spc['addtime']=date("Y-m-d H:i:d");
                 $spc['updatetime']=date("Y-m_d H:i:s");
-            }
-
-            $vpn = Db::name('cat_spec')->save($spc);
 
+                $vpn = Db::name('cat_spec')->insert($spc,true);
+                $str=$vpn;
+        }
             if ($vpn == false) {
                 Db::rollback();
                 return error_show(1002, "更新失败");
             }
-            foreach ($specs_id as $value){
-                $item =[];
-                $item['id']=$value;
-                $item['cat_spec_id']=$vpn;
-                $item['specs_id']=$value;
-                $item['is_del']=0;
-                isset($value['id']) && $value['id'] !== "" ? '' : $item['addtime'] = date("Y-m-d H:i:s");
-                $vat[] = $item;
+            $db = Db::name('cat_specs')->where(['cat_spec_id'=>$str,'is_del'=>0])->column("specs_id");
+           if(empty($db)){
+               $db=[];
+           }
+            $sn = array_diff($specs_id,$db);
+
+            $st = array_diff($db,$specs_id);
+            if(!empty($st)){
+                $int['is_del']=1;
+                $dn = Db::name('cat_specs')->where(['specs_id'=>$st,'is_del'=>0])->save($int);
+                if ($dn==false) {
+                    Db::rollback();
+                    return error_show(1002, "编辑失败");
+                }
             }
-            $vp = Db::name('cat_specs')->save($vat);
-            if ($vp) {
-                Db::rollback();
-                return error_show(1002, "编辑失败");
+            if(!empty($sn)){
+                $vat=[];
+                foreach ($sn as $value){
+                    $item=[];
+                    $item['cat_spec_id']=$str;
+                    $item['specs_id']=$value;
+                    $item['is_del']=0;
+                    $item['addtime'] = date("Y-m-d H:i:s");
+                    $vat[] = $item;
+                }
+                $vp = Db::name('cat_specs')->insertAll($vat);
+                if ($vp==0) {
+                    Db::rollback();
+                    return error_show(1002, "编辑失败");
+                }
             }
-
             Db::commit();
             return error_show(0,"编辑成功");
         }else{

app/admin/controller/Specs.php

@@ -100,4 +100,29 @@ class specs extends BaseController
         $update = Db::name("specs")->save($info);
         return  $update? error_show(0,"{$msg}成功"):error_show(1004,"{$msg}失败");
     }
+    public function title(){
+        $where=[["is_del","=",0]];
+        $spec_name = isset($this->post['spec_name']) && $this->post['spec_name'] !=="" ? trim($this->post['spec_name']):"";
+        if($spec_name!=""){
+            $where[]=['spec_name',"like","%$spec_name%"];
+        }
+        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
+        if($status!=""){
+            $where[]=['status',"=",$status];
+        }
+        $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? intval($this->post['creater']):"";
+        if($creater!=""){
+            $where[]=['creater',"like","%$creater%"];
+        }
+        $start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
+        if($start!==""){
+            $where[]=['addtime',">=",date('Y-m-d H:i:s',strtotime($start))];
+        }
+        $end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
+        if($end!==""){
+            $where[]=['addtime',"<",date('Y-m-d H:i:s',strtotime($end)+24*3600)];
+        }
+        $list = Db::name('specs')->where($where)->order("addtime desc")->select();
+        return app_show(0,"获取成功",$list);
+    }
 }

app/admin/route/app.php

@@ -219,6 +219,7 @@ Route::rule('catcreate','admin/Cat/create');
 Route::rule('catedit','admin/Cat/edit');
 Route::rule('catinfo','admin/Cat/info');
 Route::rule('catstatus','admin/Cat/status');
+Route::rule('cattitle','admin/Cat/title');
 
 Route::rule('backcreate','admin/Purchback/create');
 Route::rule('backlist','admin/Purchback/list');
@@ -279,9 +280,13 @@ Route::rule('attrstatus','admin/Attr/status');
 Route::rule('specscreate','admin/Specs/create');
 Route::rule('specslist','admin/Specs/list');
 Route::rule('specsstatus','admin/Specs/status');
+Route::rule('specstitle','admin/Specs/title');
 
 Route::rule('brandcreate','admin/Brand/create');
 Route::rule('brandlist','admin/Brand/list');
+Route::rule('brandedit','admin/Brand/edit');
+Route::rule('brandstatus','admin/Brand/status');
+
 
 Route::rule('desccreate','admin/Catdesc/create');
 Route::rule('desclist','admin/Catdesc/list');
@@ -303,6 +308,6 @@ Route::rule('businessedit','admin/Business/edit');
 Route::rule('businessdel','admin/Business/del');
 Route::rule('businessstatus','admin/Business/status');
 Route::rule('businesssinfo','admin/Business/info');
-
+Route::rule('businesstitle','admin/Business/title');