暂时发布

app/admin/controller/Good.php

@@ -198,106 +198,63 @@ class Good extends Base
             'brand_id'=>'',
             'company_name'=>'',
         ],'post','trim');
-//        $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 =[["a.is_del","=",0]];
-//        $cat_id = isset($this->post['cat_id']) && $this->post['cat_id'] !=="" ? trim($this->post['cat_id']):"";
         if($param['cat_id']!=="") $where[]=['a.cat_id',"=",$param['cat_id']];
-
-//        $good_name = isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name']):"";
         if($param['good_name']!=="") $where[]=['a.good_name','like','%'.$param['good_name'].'%'];
-
-//        $skucode = isset($this->post['skucode']) && $this->post['skucode'] !=="" ? trim($this->post['skucode']):"";
         if($param['skucode']!=='') $where [] = ['b.skucode','like','%'.$param['skucode'].'%'];
-
-//        $spucode = isset($this->post['spucode']) && $this->post['spucode'] !=="" ? trim($this->post['spucode']):"";
         if($param['spucode']!=='') $where [] = ['b.spucode','like','%'.$param['spucode'].'%'];
-
-//        $start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
         if($param['start']!=='') $where[]=['b.addtime','>=',date('Y-m-d H:i:s',strtotime($param['start']))];
-
-//        $end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
         if($param['end']!=="") $where[]=['b.addtime',"<",date('Y-m-d H:i:s',strtotime($param['end'])+24*3600)];
-
-//        $is_stock = isset($this->post['is_stock']) && $this->post['is_stock'] !=="" ? intval($this->post['is_stock']) :"";
         if($param['is_stock']!=="") $where[]=['a.is_stock',"=",$param['is_stock']];
-
-//        $good_type = isset($this->post['good_type']) && $this->post['good_type'] !=="" ? intval($this->post['good_type'])  :"";
         if($param['good_type']!=="")  $where[]=['a.good_type',"=",$param['good_type']];
-
-//        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
         if($param['supplierNo']!=="") $where[]=['a.supplierNo',"=",$param['supplierNo']];
-
-//        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo']) :"";
         if($param['companyNo']!=="")  $where[]=['a.companyNo',"like",'%'.$param['companyNo'].'%'];
-
-//        $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater']):"";
         if($param['creater']!=='')  $where[]=['a.creater',"like",'%'.$param['creater'].'%'];
-
-//        $createrid = isset($this->post['createrid']) && $this->post['createrid'] !=="" ? intval($this->post['createrid']):"";
         if($param['createrid']!=='') $where[]=['a.createrid',"=",$param['createrid']];
-
-//        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])   :"";
         if($param['status']!=='') $where[]=['a.status','=',$param['status']];
-
-        $platform_code = isset($this->post['platform_code']) && $this->post['platform_code'] !=="" ? trim($this->post['platform_code']) :"";
-        if($platform_code!==""){
-            //$platform = Db::name("good_platform")->where(["platform_code"=>$platform_code,"is_del"=>0])->column
-            //("spuCode");
-            $where[]=["platform_code","=",$platform_code];
-        }
-        $plat_code = isset($this->post['plat_code']) && $this->post['plat_code'] !=="" ? trim($this->post['plat_code'])
-            :"";
-        if($plat_code!==""){
-            $where[]=["b.plat_code","like","%$plat_code%"];
-        }
-        $exam_status = isset($this->post['exam_status']) && $this->post['exam_status'] !=="" ? intval($this->post['exam_status'])
-            :"";
-        if($exam_status!==""){
-            $where[]=['b.exam_status',"=",$exam_status];
-        }
-        $brand_id = isset($this->post['brand_id']) && $this->post['brand_id'] !=="" ? intval($this->post['brand_id'])
-            :"";
-        if($brand_id!==""){
-            $where[]=['a.brand_id',"=",$brand_id];
-        }
+        if($param['platform_code']!=="") $where[]=["platform_code",'=',$param['platform_code']];
+        if($param['plat_code']!=='') $where[]=["b.plat_code","like",'%'.$param['plat_code'].'%'];
+        if($param['exam_status']!=='') $where[]=['b.exam_status',"=",$param['exam_status']];
+        if($param['brand_id']!=="") $where[]=['a.brand_id',"=",$param['brand_id']];
         $role=$this->checkRole();
-        if(!empty($role['write']) ){
-            $where[]=["a.createrid","in",$role['write']];
-        }
-        $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
-        if ($company_name !== "") $where[] = ["a.createrid", 'in', get_company_item_user_by_name($company_name)];
+        if(!empty($role['write']) ) $where[]=["a.createrid","in",$role['write']];
+        if ($param['company_name'] !== '') $where[] = ["a.createrid", 'in', get_company_item_user_by_name($param['company_name'])];
 
-//        if(!empty($role['platform']) ){
-//            $where[]=["b.platform_code","in",$role['platform']];
-//        }
-        $count = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)
+        $count = Db::name('good')
+            ->alias("a")
+            ->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")
+            ->leftJoin("platform p","p.id=b.platform_code")
+            ->where($where)
+            ->where('p.platform_type',1)//只筛选有赞对接平台的商品
             ->count();
-        $total = ceil($count / $size);
-        $page = $page >= $total ? $total : $page;
+
+        $total = ceil($count / $param['size']);
+        $param['size'] = $param['page'] >= $total ? $total : $param['page'];
         $list = Db::name('good')
             ->alias("a")
             ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,u.itemid")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
-//            ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
             ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")
+            ->leftJoin("platform p","p.id=b.platform_code")
             ->where($where)
-            ->page($page,$size)
+            ->where('p.platform_type',1)//只筛选有赞对接平台的商品
+            ->page($param['page'],$param['size'])
             ->order("b.addtime desc")
             ->cursor();
         $data=[];
         foreach ($list as $value){
             $value['cat_info']= made($value['cat_id'],[]);
-            $platform = Db::name("platform")->where(["id"=>$value['platform_code']])->find();
+            $platform = Db::name("platform")->field('id,platform_name')->where(["id"=>$value['platform_code']])->find();
             $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
             $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
-            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+            $supplier = Db::name("supplier")->field('id,name')->where(["code"=>$value['supplierNo']])->find();
             $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
-            $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
+            $brand=Db::name("brand")->field('id,brand_name')->where(["id"=>$value['brand_id']])->find();
             $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
-            $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
+            $unit = Db::name("unit")->field('id,unit')->where(["id"=>$value['good_unit']])->find();
             $value['unit'] =isset($unit['unit'])?$unit['unit']:"";
-            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+            $company = Db::name("business")->field('id,company')->where(["companyNo"=>$value['companyNo']])->find();
             $value['company'] = isset($company['company'])?$company['company']:"";
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode'=>$value['spuCode'],"is_del"=>0])->sum("usable_stock");
             $value['status']=$value['exam_status'];