From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java |   81 ++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java
index 9dfd80f..f589fb8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java
@@ -1,60 +1,59 @@
 package com.yeshi.fanli.service.impl.taobao.dataoke;
 
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
-import com.yeshi.fanli.dao.mybatis.taobao.dataoke.DaTaoKeDetailMapper;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
-import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
+import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
 
 @Service
 public class DaTaoKeGoodsServiceImpl implements DaTaoKeGoodsService {
 
 	@Resource
-	private DaTaoKeDetailMapper daTaoKeDetailMapper;
-	
-	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+	private RedisManager redisManager;
 
-	private List<DaTaoKeDetail> reSearchDetails(List<DaTaoKeDetail> list) {
-		List<Long> idList = new ArrayList<>();
-		if (list != null) {
-			for (DaTaoKeDetail detail : list) {
-				idList.add(detail.getId());
+	@Override
+	public List<DaTaoKeDetailV2> getSearchDiscoveryGoods(String keyWords) {
+		String key = "dataoke-goods-searchdiscovery-" + keyWords;
+		List<DaTaoKeDetailV2> list = redisManager.getObjList(DaTaoKeDetailV2.class, key);
+		if (list == null || list.size() == 0) {
+			DaTaoKeGoodsResult search = DaTaoKeApiUtil.search(keyWords, null, null, null, 1, 10, 0);
+			if (search != null) {
+				list = search.getGoodsList();
+				if (list != null && list.size() > 0) {
+					Comparator<DaTaoKeDetailV2> cm = new Comparator<DaTaoKeDetailV2>() {
+						@Override
+						public int compare(DaTaoKeDetailV2 o1, DaTaoKeDetailV2 o2) {
+							int diff = o1.getHotPush() - o2.getHotPush();
+							if (diff > 0) {
+								return -1;
+							} else if (diff < 0) {
+								return 1;
+							}
+							return 0;
+						}
+					};
+
+					Collections.sort(list, cm);
+
+					if (list.size() > 3)
+						list = list.subList(0, 3);
+
+					// 缂撳瓨 20鍒嗛挓
+					redisManager.saveObjList(list, key, 1000 * 60 * 20);
+				}
+				return list;
 			}
-			List<DaTaoKeDetail> detailList = daTaoKeGoodsDetailService.listByIds(idList);
-			return detailList;
-		} else
-			return null;
-	}
-
-	@Override
-	public List<DaTaoKeDetail> getCurrentSalesRankGoodsList(Long cid) {
-		List<DaTaoKeDetail> list = DaTaoKeUtil.getCurrentSalesRank(cid);
-		return reSearchDetails(list);
-	}
-
-	@Override
-	public List<DaTaoKeDetail> getCurrentDaySalesRankGoodsList(Long cid) {
-		List<DaTaoKeDetail> list = DaTaoKeUtil.getCurrentDaySalesRank(cid);
-		return reSearchDetails(list);
-	}
-
-	@Override
-	public List<DaTaoKeDetail> getCurrentHotSalesRankGoodsList() {
-		List<DaTaoKeDetail> list = DaTaoKeUtil.getCurrentHotSalesRank();
-		return reSearchDetails(list);
-	}
-	
-	@Override
-	public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {
-		return daTaoKeDetailMapper.getGoodsNotInList(cid, listId,count);
+		}
+		return list;
 	}
 
 }

--
Gitblit v1.8.0