|
|
|
@ -243,7 +243,6 @@ class Goods extends GoodsModel |
|
|
|
{ |
|
|
|
{ |
|
|
|
$list = []; |
|
|
|
$list = []; |
|
|
|
$cate_goods_id = []; |
|
|
|
$cate_goods_id = []; |
|
|
|
|
|
|
|
|
|
|
|
$model = new PreSale(); |
|
|
|
$model = new PreSale(); |
|
|
|
$info = $model->where(['is_change' => 0, 'status' => 1])->field('goods_list,p_time')->find(); |
|
|
|
$info = $model->where(['is_change' => 0, 'status' => 1])->field('goods_list,p_time')->find(); |
|
|
|
if (!$info->isEmpty()) { |
|
|
|
if (!$info->isEmpty()) { |
|
|
|
@ -255,6 +254,9 @@ class Goods extends GoodsModel |
|
|
|
->where(['category_id' => $param['category_id']]) |
|
|
|
->where(['category_id' => $param['category_id']]) |
|
|
|
->whereIn('goods_id', $goods_ids) |
|
|
|
->whereIn('goods_id', $goods_ids) |
|
|
|
->column('distinct goods_id'); |
|
|
|
->column('distinct goods_id'); |
|
|
|
|
|
|
|
if ($cate_goods_id) { |
|
|
|
|
|
|
|
return $list; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if ($cate_goods_id) { |
|
|
|
if ($cate_goods_id) { |
|
|
|
$goods_ids = $cate_goods_id; |
|
|
|
$goods_ids = $cate_goods_id; |
|
|
|
|
wang hou sheng
11 months ago