From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index d47ad69..257ec87 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -428,7 +428,11 @@
// }
if (!StringUtil.isNullOrEmpty(kw) && (kw.startsWith("http://") || kw.startsWith("https://"))) {
- out.print(JsonUtil.loadFalseResult("鏃犳硶鎼滅储閾炬帴"));
+ JSONObject data = new JSONObject();
+ data.put("result", new JSONArray());
+ data.put("count", 0);
+ data.put("nav", new JSONArray());
+ out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -478,7 +482,7 @@
listRecommendWords = new ArrayList<String>();
}
- List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKey(kw);
+ List<TaoBaoShopVO> listShop =taoBaoShopService.getShopByKey(kw);
if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null
&& listShop.get(0).getListGoods().size() > 2) {
data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));
@@ -963,7 +967,7 @@
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
BigDecimal proportion = manageService.getFanLiRate();
- DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null,null,null, page, 20, sort);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, null, null, page, 20, sort);
if (result != null && result.getGoodsList() != null)
for (DaTaoKeDetailV2 goods : result.getGoodsList()) {
listExtra.add(
--
Gitblit v1.8.0