From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/special/S11ServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/special/S11ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/special/S11ServiceImpl.java
index 3a55505..0f6461f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/special/S11ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/special/S11ServiceImpl.java
@@ -16,11 +16,12 @@
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.special.S11Service;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -91,7 +92,7 @@
 	@Cacheable(value = "s11Cache", key = "'getPreSaleGoodsCache'+#page")
 	@Override
 	public List<TaoBaoGoodsBrief> getPreSaleGoodsCache(int page) {
-		String key = "s11_presale_goods-" + page;
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11PresaleGoods, page +"");
 		try {
 			String resultStr = redisManager.getCommonString(key);
 			if (!StringUtil.isNullOrEmpty(resultStr)) {
@@ -105,8 +106,7 @@
 		TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(8452, page, Constant.PAGE_SIZE);
 		if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
 			try {
-				redisManager.cacheCommonString("s11_presale_goods-" + page,
-						new Gson().toJson(result.getTaoBaoGoodsBriefs()), 60 * 60);// 缂撳瓨1灏忔椂
+				redisManager.cacheCommonString(key,	new Gson().toJson(result.getTaoBaoGoodsBriefs()), 60 * 60);// 缂撳瓨1灏忔椂
 			} catch (Exception e) {
 			}
 			return result.getTaoBaoGoodsBriefs();
@@ -156,7 +156,7 @@
 		sf.setPage(page);
 		sf.setPageSize(Constant.PAGE_SIZE);
 
-		String key = "s11_presale_goods-type-" + type + "-" + page;
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11PresaleGoodsType, type + "-" + page);
 		try {
 			String resultStr = redisManager.getCommonString(key);
 			if (!StringUtil.isNullOrEmpty(resultStr)) {
@@ -166,7 +166,7 @@
 		} catch (Exception e) {
 		}
 
-		TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
+		TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf,null,null);
 		if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
 			try {
 				redisManager.cacheCommonString(key, new Gson().toJson(result.getTaoBaoGoodsBriefs()), 60 * 60);// 缂撳瓨1灏忔椂

--
Gitblit v1.8.0