123

app/admin/controller/After.php

@@ -1329,7 +1329,7 @@ class After extends Base
             "spuCode" => $spuCode,
             "skuCode" => $skuCode,
 //            "good_name" => $ct['good_name'],
-//            "sale_price" => $old_cgd['good_price'],//采购单价格不为0，取原采购单的价格
+            "sale_price" => $old_cgd['good_price'],//采购单价格不为0，取原采购单的价格
             "total_fee" => $old_cgd['good_price'] * $good_num,
 //            "pakge_fee" => isset($origin['package_fee']) ? $origin['package_fee'] : 0,
 //            "cert_fee" => isset($origin['cert_fee']) ? $origin['cert_fee'] : 0,
@@ -1668,7 +1668,7 @@ class After extends Base
             "skuCode" => $skuCode,
             "orderCode" => $orderCode,
 //            "good_name"=>$zxinfo['good_name'],
-//            "sale_price" => $old_cgd['good_price'],//采购单价格不为0，取原采购单的价格
+            "sale_price" => $old_cgd['good_price'],//采购单价格不为0，取原采购单的价格
             "total_fee"=>round($old_cgd['good_price']* $good_num, 2),
 //            "pakge_fee"=>$zxinfo['pakge_fee'],
 //            "cert_fee"=>$zxinfo['cert_fee'],

app/admin/controller/Good.php

@@ -185,8 +185,18 @@ class Good extends Base
             'spucode'=>'',
             'start'=>'',
             'end'=>'',
-            ''=>'',
-            ''=>'',
+            'is_stock'=>'',
+            'good_type'=>'',
+            'supplierNo'=>'',
+            'companyNo'=>'',
+            'creater'=>'',
+            'createrid'=>'',
+            'status'=>'',
+            'platform_code'=>'',
+            'plat_code'=>'',
+            'exam_status'=>'',
+            '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";
@@ -206,44 +216,31 @@ class Good extends Base
 //        $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($end!==""){
-            $where[]=['b.addtime',"<",date('Y-m-d H:i:s',strtotime($end)+24*3600)];
-        }
-        $is_stock = isset($this->post['is_stock']) && $this->post['is_stock'] !=="" ? intval($this->post['is_stock'])
-            :"";
-        if($is_stock!==""){
-            $where[]=['a.is_stock',"=",$is_stock];
-        }
-        $good_type = isset($this->post['good_type']) && $this->post['good_type'] !=="" ? intval($this->post['good_type'])
-            :"";
-        if($good_type!==""){
-            $where[]=['a.good_type',"=",$good_type];
-        }
-        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
-            :"";
-        if($supplierNo!==""){
-            $where[]=['a.supplierNo',"=",$supplierNo];
-        }
-        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo']) :"";
-        if($companyNo!==""){
-            $where[]=['a.companyNo',"like","%$companyNo%"];
-        }
-        $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater']):"";
-        if($creater!==""){
-            $where[]=['a.creater',"like","%$creater%"];
-        }
-        $createrid = isset($this->post['createrid']) && $this->post['createrid'] !=="" ? intval($this->post['createrid']):"";
-        if($createrid!==""){
-            $where[]=['a.createrid',"=",$createrid];
-        }
-        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])
-            :"";
-        if($status!==""){
-            $where[]=['a.status',"=",$status];
-        }
-        $platform_code = isset($this->post['platform_code']) && $this->post['platform_code'] !=="" ? trim($this->post['platform_code'])
-            :"";
+//        $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");