From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:37:26 +0800
Subject: [PATCH] 动态提示语调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 70 +++++++++++++++--------------------
1 files changed, 30 insertions(+), 40 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 7a79777..dc46bab 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
@@ -24,8 +24,8 @@
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.search.HotSearch;
-import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -34,17 +34,16 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.config.HotSearchService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.EhcacheUtil;
@@ -71,10 +70,10 @@
private ConfigService configService;
@Resource
- private SuperHotSearchService superHotSearchSerivce;
-
+ private HotSearchService hotSearchService;
+
@Resource
- private HistorySearchService historySearchService;
+ private HistorySearchService historySearchService;
@Resource
private HongBaoManageService manageService;
@@ -95,41 +94,32 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
+ /**
+ * 鐑棬鎼滅储
+ * @param acceptData
+ * @param goodsType
+ * @param out
+ */
@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
public void getHotSearch(AcceptData acceptData, Integer goodsType, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
// 榛樿娣樺疂
if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce
- .getSuperHotSearchBySystemIdCache(system.getId(), goodsType);
- if (superHotSearchList == null || superHotSearchList.size() == 0) {
+ List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);
+ if (list == null || list.size() == 0) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
return;
}
- List<HotSearch> hotSearchList = new ArrayList<HotSearch>();
- for (SuperHotSearch superHotSearch : superHotSearchList) {
- HotSearch hotSearch = superHotSearch.getHotSearch();
- if (hotSearch != null)
- hotSearchList.add(hotSearch);
- }
-
+
JSONObject data = new JSONObject();
- data.put("count", hotSearchList.size());
- data.put("hotSearchList", hotSearchList);
- String result = JsonUtil.loadTrueResult(data);
- out.print(result);
- return;
+ data.put("count", list.size());
+ data.put("hotSearchList", list);
+ out.print(JsonUtil.loadTrueResult(data));
}
@RequestMapping("specialSearch")
@@ -631,9 +621,9 @@
}
// 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetail> daTaoKeList = null;
+ List<DaTaoKeDetailV2> daTaoKeList = null;
if (page == 1)
- daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(kw);
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(kw);
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
if (result == null) {
@@ -685,7 +675,7 @@
try {
if (daTaoKeList != null && daTaoKeList.size() > 0) {
Collections.reverse(daTaoKeList);
- for (DaTaoKeDetail detail : daTaoKeList) {
+ for (DaTaoKeDetailV2 detail : daTaoKeList) {
taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
}
}
@@ -798,7 +788,7 @@
provinceId = array.optJSONObject(i).optInt("id");
} else if ("tkRate1".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -814,7 +804,7 @@
}
} else if ("tkRate2".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -830,7 +820,7 @@
}
} else if ("tkRate3".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -846,7 +836,7 @@
}
} else if ("tkRate4".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -862,7 +852,7 @@
}
} else if ("tkRate5".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -1000,7 +990,7 @@
*/
public void setSearchTkRate(int i, SearchFilter sf) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
--
Gitblit v1.8.0