Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test

application/services/goods/ElasticGoodService.php

@@ -233,7 +233,7 @@ class ElasticGoodService
         ];
         //gte 是大于等于; gt是大于; lte是小于等于; lt是小于
         $data["query"]["bool"]["filter"][]["range"] = ["inventory_rest" => [["gt" => 0]]];
-
+        $data["query"]["bool"]["filter"][]["range"] = ["price" => [["gt" => 0]]];
         if (!empty($searchContent) || (!empty($subjectName) && $subjectName != "本周上新")) {
             $multiMatch = [["multi_match" => [
                 "query" => $searchContent.$subjectName,

application/services/tcc/TccService.php

@@ -429,7 +429,7 @@ class TccService
             foreach ($skus as $sku) {
                 $goodsSkuId = $sku["goods_sku_id"];
 
-                if (!empty($sku["total_amount_order"]) && $sku["online_status"] == GoodsSku::ONLINE_STATUS_ONLINE) {
+                if (!empty($sku["total_amount_order"])) {
                     if (empty($numList[$goodsSkuId])) {
                         return self::TCC_RESULT_FAIL;
                     }
@@ -556,7 +556,7 @@ class TccService
             foreach ($skus as $sku) {
                 $goodsSkuId = $sku["goods_sku_id"];
 
-                if (!empty($sku["inventory_lock"]) && $sku["online_status"] == GoodsSku::ONLINE_STATUS_ONLINE) {
+                if (!empty($sku["inventory_lock"])) {
                     if (empty($numList[$goodsSkuId])) {
                         return self::TCC_RESULT_FAIL;
                     }
@@ -696,7 +696,7 @@ class TccService
             foreach ($skus as $sku) {
                 $goodsSkuId = $sku["goods_sku_id"];
 
-                if (!empty($sku["inventory_lock"]) && $sku["online_status"] == GoodsSku::ONLINE_STATUS_ONLINE) {
+                if (!empty($sku["inventory_lock"])) {
                     if (empty($numList[$goodsSkuId])) {
                         return self::TCC_RESULT_FAIL;
                     }