|
|
@@ -40,10 +40,10 @@ class GoodsCategoryClass extends BaseClass
|
|
|
$query->andWhere(['xhGoodsCategory.cId' => $cId]);
|
|
|
}
|
|
|
if (!empty($askInfo['searchText'])) {
|
|
|
- $query->andWhere(['like', 'xhGoodsCategory.name', $askInfo['searchText']]);
|
|
|
+ $query->andWhere(['like', 'xhGoods.name', $askInfo['searchText']]);
|
|
|
}
|
|
|
if (!empty($askInfo['search'])) {
|
|
|
- $query->andWhere(['like', 'xhGoodsCategory.name', $askInfo['search']]);
|
|
|
+ $query->andWhere(['like', 'xhGoods.name', $askInfo['search']]);
|
|
|
}
|
|
|
$query->joinWith(['goods' => function ($query) use ($askInfo, $requestType) {
|
|
|
|
|
|
@@ -82,12 +82,8 @@ class GoodsCategoryClass extends BaseClass
|
|
|
$query->andWhere(['xhGoods.delStatus' => 0]);
|
|
|
$query->andWhere(['xhGoods.status' => 1]);
|
|
|
} elseif ($requestType == 'album') {
|
|
|
- //相册
|
|
|
- $query->andWhere(['xhGoods.delStatus' => 0]);
|
|
|
- $query->andWhere(['xhGoods.status' => 1]);
|
|
|
- $query->andWhere(['xhGoods.priceType' => 0]);
|
|
|
+ util::fail('相册已经不存在');
|
|
|
}
|
|
|
-
|
|
|
}]);
|
|
|
|
|
|
|
|
|
@@ -102,7 +98,7 @@ class GoodsCategoryClass extends BaseClass
|
|
|
$list = [];
|
|
|
$addedGoodsIds = []; // 用于记录已添加的商品ID,避免重复,一个商品在多个分类下就会出现重复,搜索的情况下
|
|
|
foreach ($goodsCategoryInfoList as $info) {
|
|
|
- if ($info->goods && !in_array($info->goods->id, $addedGoodsIds)) {
|
|
|
+ if ($info->goods && !in_array($info->goods->id, $addedGoodsIds)) {
|
|
|
// 只要有关联且有库存的商品,且未添加过
|
|
|
$list[] = $info->goods->attributes;
|
|
|
$addedGoodsIds[] = $info->goods->id; // 记录已添加的商品ID
|