Merge remote-tracking branch 'origin/feature-201820-wangcz' into feature-201820-wangcz

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

@@ -149,7 +149,7 @@ public class SearchUrl {
     /**
      * 搜索库存信息(类目)
      */
-    public static final String GOODIS_URL_KIND= "/search/goodsIds?params={params}";
+    public static final String GOODIS_URL_KIND= "/search/oldGoodsIds?params={params}";
 
 
     /**

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

@@ -288,7 +288,7 @@ public class SearchServiceImpl implements SearchService{
     public Map<String,Object> getSimilarKeywords(String keyword, String type) throws SearchException {
         Map<String, Object> map = new HashedMap();
         map.put("keyword", keyword);
-        String result;
+        String result = "",resultKind= "",resultCmp = "",resultBrand = "";
         switch (type) {
             case COMPONENT:
                 result = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.SIMILAR_PRODUCTS_URL, String.class, map);
@@ -300,23 +300,37 @@ public class SearchServiceImpl implements SearchService{
             case KIND:
                 result = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.SIMILAR_KIND_URL, String.class, map);
                 break;
+            case ALL:
+                resultCmp = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.SIMILAR_PRODUCTS_URL, String.class, map);
+                resultCmp = resultCmp.replaceAll("pcmpcode","code");
+                resultBrand = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.SIMILAR_BRAND_URL, String.class, map);
+                resultKind = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.SIMILAR_KIND_URL, String.class, map);
+                break;
             default:
                 result = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.SIMILAR_KEYWORD_URL, String.class, map);
                 break;
         }
-
-        if(StringUtils.isEmpty(result)) {
-            return null;
-        }else {
-            try {
-                List<Object> resultMap = FastjsonUtils.fromJsonArray(result);
-                map.clear();
-                map.put("result",resultMap);
-                return map;
-            }catch (Exception e) {
-                e.printStackTrace();
-                return null;
+        try {
+            switch (type) {
+                case ALL:
+                    List<Object> resultMapCmp = FastjsonUtils.fromJsonArray(resultCmp);
+                    List<Object> resultMapKind = FastjsonUtils.fromJsonArray(resultKind);
+                    List<Object> resultMapBrand = FastjsonUtils.fromJsonArray(resultBrand);
+                    map.clear();
+                    map.put("component",resultMapCmp);
+                    map.put("kind",resultMapKind);
+                    map.put("brand",resultMapBrand);
+                    break;
+                default:
+                    List<Object> resultMap = FastjsonUtils.fromJsonArray(result);
+                    map.clear();
+                    map.put("result",resultMap);
+                    break;
             }
+            return map;
+        }catch (Exception e) {
+            e.printStackTrace();
+            return null;
         }
     }