提交 16cf9ec1 authored 作者: 窦斌's avatar 窦斌

edit

上级 ceb79d04
...@@ -12,14 +12,14 @@ class SynJdOrderApi extends Command ...@@ -12,14 +12,14 @@ class SynJdOrderApi extends Command
* *
* @var string * @var string
*/ */
protected $signature = 'getOrder'; protected $signature = 'SynJdOrderApi';
/** /**
* The console command description. * The console command description.
* *
* @var string * @var string
*/ */
protected $description = 'Command getJdOrder'; protected $description = 'Command SynJdOrderApi';
/** /**
* Create a new command instance. * Create a new command instance.
......
...@@ -211,7 +211,9 @@ class GoodsBrandController extends BaseController ...@@ -211,7 +211,9 @@ class GoodsBrandController extends BaseController
if(RedisService::redisGet('gbList')){ if(RedisService::redisGet('gbList')){
//echo 1; //echo 1;
$gbList = RedisService::redisGet('gbList'); $gbList = RedisService::redisGet('gbList');
$gbList = CommonService::arrayFilterFieldValue($gbList,[['company_id'=>$session['company_id']]]); if($session['admin_groupnew'] !=7) {
$gbList = CommonService::arrayFilterFieldValue($gbList, [['company_id' => $session['company_id']]]);
}
return $this->success('获取成功',$gbList); return $this->success('获取成功',$gbList);
//return $cdList; //return $cdList;
}else{ }else{
...@@ -219,7 +221,9 @@ class GoodsBrandController extends BaseController ...@@ -219,7 +221,9 @@ class GoodsBrandController extends BaseController
$gbLists = PjBrandsService::gbList(); $gbLists = PjBrandsService::gbList();
$gbList = json_encode($gbLists); $gbList = json_encode($gbLists);
RedisService::redisSet('gbList',$gbList); RedisService::redisSet('gbList',$gbList);
$gbLists = CommonService::arrayFilterFieldValue($gbLists,[['company_id'=>$session['company_id']]]); if($session['admin_groupnew'] !=7) {
$gbLists = CommonService::arrayFilterFieldValue($gbLists, [['company_id' => $session['company_id']]]);
}
return $this->success('获取成功',$gbLists); return $this->success('获取成功',$gbLists);
} }
// if(RedisService::redisGet('gbList')){ // if(RedisService::redisGet('gbList')){
......
...@@ -467,9 +467,9 @@ class OrderListService extends Service ...@@ -467,9 +467,9 @@ class OrderListService extends Service
$where['stauas_searchin'] = [10,20]; $where['stauas_searchin'] = [10,20];
}elseif ($input['state'] == 3){ //安装中 }elseif ($input['state'] == 3){ //安装中
$where['stauas'] = 30; $where['stauas'] = 30;
$search['day_time_searchlt'] = $time; // $search['day_time_searchlt'] = $time;
$search['day_time_isnull'] = null; // $search['day_time_isnull'] = null;
$where['day_time_searchor'] = $search; // $where['day_time_searchor'] = $search;
}elseif ($input['state'] == 4){ //延期订单 }elseif ($input['state'] == 4){ //延期订单
$where['stauas'] = 30; $where['stauas'] = 30;
$where['day_time_searchgt'] = $time; $where['day_time_searchgt'] = $time;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论