|
@@ -41,17 +41,20 @@ class Stock extends Base
|
|
|
}
|
|
|
$stock_low = isset($this->post['stock_low'])&&$this->post['stock_low']!=="" ? intval($this->post['stock_low'])
|
|
|
:"";
|
|
|
+ $wherestock="1=1";
|
|
|
if($stock_low!=""){
|
|
|
- $where['stock_balance'] = [">=",$stock_low];
|
|
|
+ // $where['stock_balance'] = [">=",$stock_low];
|
|
|
+ $wherestock .=" and stock_balance>={$stock_low}";
|
|
|
}
|
|
|
$stock_up = isset($this->post['stock_up'])&&$this->post['stock_up']!=="" ? intval($this->post['stock_up']) :"";
|
|
|
if($stock_up!=""){
|
|
|
- $where['stock_balance'] = ["<=",$stock_up];
|
|
|
+ // $where['stock_balance'] = ["<=",$stock_up];
|
|
|
+ $wherestock .=" and stock_balance<={$stock_up}";
|
|
|
}
|
|
|
- $count= Db::name("stock_list")->where($where)->count();
|
|
|
+ $count= Db::name("stock_list")->where($where)->where($wherestock)->count();
|
|
|
$total = ceil($count/$size);
|
|
|
$page = $page>=$total? $total:$page;
|
|
|
- $list = Db::name("stock_list")->where($where)->page($page,$size)->field("id,username,status,nickname,mobile,stock_balance,stock_update")->order("stock_update desc")->select();
|
|
|
+ $list = Db::name("stock_list")->where($where)->where($wherestock)->page($page,$size)->field("id,username,status,nickname,mobile,stock_balance,stock_update")->order("stock_update desc")->select();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
|
|
|