Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

app/Controller/v3/GoodsRecommendController.php

@@ -2,6 +2,7 @@
 
 namespace App\Controller\v3;
 
+use App\Constants\v3\Goods as GoodsConstants;
 use App\Constants\v3\Store as StoreConstants;
 use App\Constants\v3\Tabs;
 use App\Controller\BaseController;
@@ -43,7 +44,11 @@ class GoodsRecommendController extends BaseController
                 ''.$storeTable.'.is_rest' => StoreConstants::IS_REST_NO
             ])
             ->with(['store'])
-            ->where([''.$goodsTable.'.market_id' => $marketId])
+            ->where([
+                ''.$goodsTable.'.market_id' => $marketId,
+                ''.$goodsTable.'.on_sale' => GoodsConstants::ON_SALE_YES
+            ])
+            ->whereRaw(''.$goodsTable.'.deleted_at IS NULL')
             ->where(function ($query) use ($goodsTable) {
                 $query->where(''.$goodsTable.'.inventory', '>', 0)->orWhere(''.$goodsTable.'.is_infinite', '=', 1);
             });
@@ -109,7 +114,11 @@ class GoodsRecommendController extends BaseController
                 ''.$storeTable.'.is_rest' => StoreConstants::IS_REST_NO
             ])
             ->with(['store'])
-            ->where([''.$goodsTable.'.market_id' => $marketId])
+            ->where([
+                ''.$goodsTable.'.market_id' => $marketId,
+                ''.$goodsTable.'.on_sale' => GoodsConstants::ON_SALE_YES
+            ])
+            ->whereRaw(''.$goodsTable.'.deleted_at IS NULL')
             ->where(function ($query) use ($goodsTable) {
                 $query->where(''.$goodsTable.'.inventory', '>', 0)->orWhere(''.$goodsTable.'.is_infinite', '=', 1);
             })

app/Service/v3/Implementations/SearchService.php

@@ -30,8 +30,12 @@ class SearchService implements SearchServiceInterface
                 ''.$storeTable.'.status' => StoreConstants::STATUS_PASS,
                 ''.$storeTable.'.is_rest' => StoreConstants::IS_REST_NO
             ])
+            ->where([
+                ''.$goodsTable.'.market_id' => $params['market_id'],
+                ''.$goodsTable.'.on_sale' => GoodsConstants::ON_SALE_YES
+            ])
+            ->whereRaw(''.$goodsTable.'.deleted_at IS NULL')
             ->with(['store'])
-            ->where([''.$goodsTable.'.market_id' => $params['market_id']])
             ->where(function ($query) use ($goodsTable) {
                 $query->where(''.$goodsTable.'.inventory', '>', 0)->orWhere(''.$goodsTable.'.is_infinite', '=', 1);
             });
@@ -97,9 +101,7 @@ class SearchService implements SearchServiceInterface
             ->where(function ($query) use ($goodsTable) {
                 $query->where(''.$goodsTable.'.inventory', '>', 0)->orWhere(''.$goodsTable.'.is_infinite', '=', 1);
             })
-            // ->with(['goods' => function($query) {
-            //     return $query->select(['*'])->addSelect(['sales as total_sales']);
-            // }])
+            ->whereRaw(''.$goodsTable.'.deleted_at IS NULL')
             ->where([''.$storeTable.'.market_id' => $params['market_id']]);
 
         if (isset($params['store_id']) && $params['store_id']) {