|
|
@@ -38,7 +38,7 @@ class GoodsCategoryClass extends BaseClass
|
|
|
$query->andWhere(['like', 'xhGoodsCategory.name', $askInfo['searchText']]);
|
|
|
}
|
|
|
|
|
|
- $query->joinWith(['goods' => function ($query) use ($askInfo,$requestType) {
|
|
|
+ $query->joinWith(['goods' => function ($query) use ($askInfo, $requestType) {
|
|
|
|
|
|
if ($requestType == 'kd') {
|
|
|
//花束开单
|
|
|
@@ -49,7 +49,7 @@ class GoodsCategoryClass extends BaseClass
|
|
|
|
|
|
$query->andWhere(['xhGoods.delStatus' => 0]);
|
|
|
|
|
|
- $priceStatus = $askInfo['priceStatus'] ?? -1;
|
|
|
+ $priceStatus = is_numeric($askInfo['priceStatus']) ? $askInfo['priceStatus'] : -1;
|
|
|
if ($priceStatus > -1) {
|
|
|
//1 有价格,2 无价格
|
|
|
if ($priceStatus == 1) {
|
|
|
@@ -60,7 +60,7 @@ class GoodsCategoryClass extends BaseClass
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $stockStatus = $askInfo['stockStatus'] ?? -1;
|
|
|
+ $stockStatus = is_numeric($askInfo['stockStatus']) ? $askInfo['stockStatus'] : -1;
|
|
|
if ($stockStatus > -1) {
|
|
|
//1 有库存,2 无库存
|
|
|
if ($stockStatus == 1) {
|
|
|
@@ -71,7 +71,7 @@ class GoodsCategoryClass extends BaseClass
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $flowerNum = $askInfo['flowerNum'] ?? 0;
|
|
|
+ $flowerNum = is_numeric($askInfo['flowerNum']) ? $askInfo['flowerNum'] : 0;
|
|
|
if ($flowerNum > 0) {
|
|
|
$query->andWhere(['xhGoods.flowerNum' => $flowerNum]);
|
|
|
}
|
|
|
@@ -90,7 +90,6 @@ class GoodsCategoryClass extends BaseClass
|
|
|
}]);
|
|
|
|
|
|
|
|
|
-
|
|
|
$query->orderBy(['inTurn' => SORT_DESC]);
|
|
|
// 获取总数
|
|
|
$total = $query->count();
|