Merge branch 'master' into ysx-华云改造-20240304

.env

@@ -123,7 +123,7 @@ RABBITMQ2_QUEUE=wms_service
 #RABBITMQ_LOGIN=huntadmin
 #RABBITMQ_LOGIN=huntadmin
 #RABBITMQ_PASSWORD=jy2y2900
 #RABBITMQ_PASSWORD=jy2y2900
 
 
-ES_SKU_URL=http://so.liexin.net/search/Es/searchSku
+ES_SKU_URL=http://search.liexindev.net/search/es/searchSku
 ES_URL=http://so.liexin.net
 ES_URL=http://so.liexin.net
 CLOUD_URL=http://cloud.liexindev.net
 CLOUD_URL=http://cloud.liexindev.net
 
 

app/Http/Services/SkuService.php

@@ -32,6 +32,7 @@ class SkuService
         $map = $filter->listFilter();
         $map = $filter->listFilter();
         $url = env('ES_SKU_URL', '');
         $url = env('ES_SKU_URL', '');
         $map['show_status'] = 1;
         $map['show_status'] = 1;
+        $map['no_rule'] = 1122;
         $return = curl($url, $map, 1);
         $return = curl($url, $map, 1);
 
 
         $data = json_decode($return, true);
         $data = json_decode($return, true);

app/Http/Services/SkuStatisticsService.php

@@ -36,6 +36,7 @@ class SkuStatisticsService
     private function getStatisticsCount($type)
     private function getStatisticsCount($type)
     {
     {
         $url = env('ES_SKU_URL', '');
         $url = env('ES_SKU_URL', '');
+        $map['no_rule'] = 1122;
         $map['supplier_id'] = 17;
         $map['supplier_id'] = 17;
         switch ($type) {
         switch ($type) {
             case "all":
             case "all":
@@ -55,4 +56,4 @@ class SkuStatisticsService
         }
         }
         return $total;
         return $total;
     }
     }
-}
+}
\ No newline at end of file