更新

biz-hd/goods/classes/GoodsCategoryClass.php

@@ -53,26 +53,21 @@ class GoodsCategoryClass extends BaseClass
 
                 $query->andWhere(['xhGoods.delStatus' => 0]);
 
-                $priceStatus = isset($askInfo['priceStatus']) && is_numeric($askInfo['priceStatus']) ? $askInfo['priceStatus'] : -1;
-                if ($priceStatus > -1) {
-                    //1 有价格，2 无价格
-                    if ($priceStatus == 1) {
-                        $query->andWhere(['xhGoods.priceType' => 1]);
-                    }
-                    if ($priceStatus == 2) {
-                        $query->andWhere(['xhGoods.priceType' => 0]);
-                    }
+                $priceType = isset($askInfo['priceType']) && is_numeric($askInfo['priceType']) ? $askInfo['priceType'] : -1;
+                if ($priceType > -1) {
+                    //0 无价格，1 有价格
+                    $query->andWhere(['xhGoods.priceType' => $priceType]);
                 }
 
-                $stockStatus = isset($askInfo['stockStatus']) && is_numeric($askInfo['stockStatus']) ? $askInfo['stockStatus'] : -1;
-                if ($stockStatus > -1) {
-                    //1 有库存，2 无库存
-                    if ($stockStatus == 1) {
-                        $query->andWhere(['>', 'xhGoods.stock', 0]);
-                    }
-                    if ($stockStatus == 2) {
+                $hasStock = isset($askInfo['hasStock']) && is_numeric($askInfo['hasStock']) ? $askInfo['hasStock'] : -1;
+                if ($hasStock > -1) {
+                    //$hasStock 0 没库存 1有库存
+                    if ($hasStock == 0) {
                         $query->andWhere(['xhGoods.stock' => 0]);
                     }
+                    if ($hasStock == 1) {
+                        $query->andWhere(['>', 'xhGoods.stock', 0]);
+                    }
                 }
 
                 $flowerNum = isset($askInfo['flowerNum']) && is_numeric($askInfo['flowerNum']) ? $askInfo['flowerNum'] : 0;