From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
index f2ddaeb..df589a5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
@@ -1,23 +1,46 @@
 package com.yeshi.fanli.service.impl.goods;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import com.yeshi.fanli.dto.common.CommonContentNav;
 import com.yeshi.fanli.dto.common.PDDCommonContentTypeEnum;
 import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
 import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;
+import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
 import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
 
 @Service
 public class PDDCommonTemplateContentServiceImpl implements PDDCommonTemplateContentService {
 
+	@Resource
+	private PDDGoodsService pddGoodsService;
+	 
+	
 	@Cacheable(value = "pddCommonContentCache", key = "#type+'-'+#cid+'-'+#page+'-'+#pageSize")
 	@Override
 	public PDDGoodsResult getContentList(PDDCommonContentTypeEnum type, String cid, int page, int pageSize) {
 		if (type == PDDCommonContentTypeEnum._1k9 || type == PDDCommonContentTypeEnum.todayTop 
 				|| type == PDDCommonContentTypeEnum.brandClear) {
 			return PinDuoDuoApiUtil.searchByChannelType(page - 1, pageSize, type.getContent());
-		} 
+		} else if (type == PDDCommonContentTypeEnum.hotSaleGoods) {
+			return pddGoodsService.getTopGoodsList(page, 2);
+		}
 		return null;
 	}
+	
+	
+	@Override
+	public List<CommonContentNav> getNavList(PDDCommonContentTypeEnum type) {
+		List<CommonContentNav> navList = new ArrayList<>();
+		if (type == PDDCommonContentTypeEnum.hotSaleGoods) {
+			
+		}
+		return navList;
+	}
 }

--
Gitblit v1.8.0