|
|
@@ -31,27 +31,27 @@ class Good extends \app\BaseController
|
|
|
{
|
|
|
parent::__construct($app);
|
|
|
$this->post = $this->request->post();
|
|
|
- $token = isset($this->post['token']) ? trim($this->post['token']) : "";
|
|
|
- if($token==""){
|
|
|
- return error_show(101,'token不能为空');
|
|
|
- }
|
|
|
- $effetc = VerifyTokens($token);
|
|
|
- if(!empty($effetc) && $effetc['code']!=0){
|
|
|
- return error_show($effetc['code'],$effetc['message']);
|
|
|
- }
|
|
|
+// $token = isset($this->post['token']) ? trim($this->post['token']) : "";
|
|
|
+// if($token==""){
|
|
|
+// return error_show(101,'token不能为空');
|
|
|
+// }
|
|
|
+// $effetc = VerifyTokens($token);
|
|
|
+// if(!empty($effetc) && $effetc['code']!=0){
|
|
|
+// return error_show($effetc['code'],$effetc['message']);
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
public function list(){
|
|
|
$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 =[["is_del","=",0]];
|
|
|
+ $where =[["a.is_del","=",0]];
|
|
|
$cat_id = isset($this->post['cat_id']) && $this->post['cat_id'] !=="" ? trim($this->post['cat_id']):"";
|
|
|
if($cat_id!==""){
|
|
|
- $where[]=['cat_id',"=",$cat_id];
|
|
|
+ $where[]=['a.cat_id',"=",$cat_id];
|
|
|
}
|
|
|
$good_name = isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name']):"";
|
|
|
if($good_name!==""){
|
|
|
- $where[]=['good_name',"like","$good_name"];
|
|
|
+ $where[]=['a.good_name',"like","$good_name"];
|
|
|
}
|
|
|
// $good_code = isset($this->post['good_code']) && $this->post['good_code'] !=="" ? trim($this->post['good_code']):"";
|
|
|
// if($good_code!==""){
|
|
|
@@ -59,21 +59,43 @@ class Good extends \app\BaseController
|
|
|
// }
|
|
|
$start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
|
|
|
if($start!==""){
|
|
|
- $where[]=['addtime',">=",date('Y-m-d H:i:s',strtotime($start))];
|
|
|
+ $where[]=['a.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)];
|
|
|
+ $where[]=['a.addtime',"<",date('Y-m-d H:i:s',strtotime($end)+24*3600)];
|
|
|
}
|
|
|
- $count = Db::name('good')->where($where)->count();
|
|
|
+ $is_stock = isset($this->post['is_stock']) && $this->post['is_stock'] !=="" ? intval($this->post['is_stock'])
|
|
|
+ :"";
|
|
|
+ if($is_stock!==""){
|
|
|
+ $where[]=['is_stock',"=",$is_stock];
|
|
|
+ }
|
|
|
+ $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
|
|
|
+ :"";
|
|
|
+ if($supplierNo!==""){
|
|
|
+ $where[]=['supplierNo',"=",$supplierNo];
|
|
|
+ }
|
|
|
+ $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];
|
|
|
+ }
|
|
|
+ $count = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)
|
|
|
+ ->count();
|
|
|
$total = ceil($count / $size);
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
- $list = Db::name('good')->where($where)->page($page,$size)->order("addtime desc")->select();
|
|
|
+ $list = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)->page
|
|
|
+ ($page,$size)->field("b.skuCode,b.platform_code,b.id as good_id,a.*")->order("addtime desc")->select();
|
|
|
$data=[];
|
|
|
foreach ($list as $value){
|
|
|
$value['cat_info']= made($value['cat_id'],[]);
|
|
|
+ $platform = Db::name("platform")->where(["platform_code"=>$value['platform_code']])->find();
|
|
|
+ $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
|
|
|
+ $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
|
|
|
+ $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
|
|
|
$data[]=$value;
|
|
|
-
|
|
|
}
|
|
|
return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
|
|
|
}
|
