Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2c into dev

src/main/java/com/uas/platform/b2c/common/search/constant/SearchUrl.java

@@ -32,7 +32,7 @@ public class SearchUrl {
     /**
      * 搜索器件的id
      */
-    public static final String COMPONENT_ID_URL = "http://10.10.100.191:8092/search/componentIds?keyword={keyword}&page={page}&size={size}";
+    public static final String COMPONENT_ID_URL = "http://10.10.100.191:8092/search/componentIds?keyword={keyword}&params={params}";
 
     /**
      * 根据品牌id后去类目的id
@@ -102,7 +102,7 @@ public class SearchUrl {
     /**
      * 搜索库存信息
      */
-    public static final String GOODIS_URL= "http://10.10.100.191:8092/search/goodsIds?keyword={keyword}&page={page}&size={size}&filters={filters}&sort={sort}";
+    public static final String GOODIS_URL= "http://10.10.100.191:8092/search/goodsIds?keyword={keyword}&params={params}";
 
 
     /**

src/main/java/com/uas/platform/b2c/common/search/rpc/service/Impl/SearchServiceImpl.java

@@ -1,10 +1,10 @@
 package com.uas.platform.b2c.common.search.rpc.service.Impl;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.search.constant.SearchUrl;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.exception.SearchException;
 import com.uas.search.model.CollectField;
 import com.uas.search.model.PageParams;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -106,7 +105,9 @@ public class SearchServiceImpl implements SearchService{
 
     @Override
     public Map<String, Object> getComponentIds(String keyword, PageParams var2) throws SearchException {
-        Map<String, Object> map = initSearchMap(keyword, var2.getPage(), var2.getSize());
+        Map<String, Object> map = new HashedMap();
+        map.put("keyword", keyword);
+        map.put("params", FlexJsonUtils.toJsonDeep(var2));
         String str = restTemplate.getForObject(SearchUrl.COMPONENT_ID_URL, String.class, map);
         if(StringUtils.isEmpty(str)) {
             return null;
@@ -331,18 +332,7 @@ public class SearchServiceImpl implements SearchService{
     public Map<String, Object> getGoodsIds(String keyword, PageParams var2) throws SearchException {
         Map<String, Object> map = new HashedMap();
         map.put("keyword", keyword);
-        map.put("page", var2.getPage());
-        map.put("size", var2.getSize());
-        if(var2.getFilters() == null) {
-            map.put("filters", new JSONObject());
-        }else {
-            map.put("filters", FastjsonUtils.toJson(var2.getFilters()));
-        }
-        if(var2.getSort() == null) {
-            map.put("sort", new ArrayList<>());
-        }else {
-            map.put("sort", FastjsonUtils.toJson(var2.getSort()));
-        }
+        map.put("params", FlexJsonUtils.toJsonDeep(var2));
         String str = restTemplate.getForObject(SearchUrl.GOODIS_URL, String.class, map);
         if(StringUtils.isEmpty(str)) {
             return null;