From d6c8cce305427ba64005d4e349e169446e0d1801 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 09:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 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 11f780d..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
@@ -3,38 +3,33 @@
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.dto.pdd.PDDSearchFilter;
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.brandGoods) {
- PDDSearchFilter pddfilter = new PDDSearchFilter();
- pddfilter.setPage(page);
- pddfilter.setPageSize(pageSize);
- pddfilter.setSortType(22);
- if ("-1".equalsIgnoreCase(cid)) {
- pddfilter.setOptId(-1L);
- } else {
- long catId = Long.parseLong(cid);
- pddfilter.setCatId(catId);
- pddfilter.setOptId(catId);
- }
- return PinDuoDuoApiUtil.searchGoods(pddfilter);
+ } else if (type == PDDCommonContentTypeEnum.hotSaleGoods) {
+ return pddGoodsService.getTopGoodsList(page, 2);
}
return null;
}
@@ -43,27 +38,8 @@
@Override
public List<CommonContentNav> getNavList(PDDCommonContentTypeEnum type) {
List<CommonContentNav> navList = new ArrayList<>();
- if (type == PDDCommonContentTypeEnum.brandGoods) {
- navList.add(new CommonContentNav("-1", "绮鹃��"));
- //navList.add(new CommonContentNav("-11", "娓呬粨"));
- navList.add(new CommonContentNav("15", "鐧捐揣 "));
- navList.add(new CommonContentNav("4", "姣嶅┐"));
- navList.add(new CommonContentNav("1", "椋熷搧"));
- navList.add(new CommonContentNav("14", "濂宠"));
- navList.add(new CommonContentNav("18", "鐢靛櫒"));
- navList.add(new CommonContentNav("1281", "闉嬪寘"));
- navList.add(new CommonContentNav("1282", "鍐呰。"));
- navList.add(new CommonContentNav("16", "缇庡"));
- navList.add(new CommonContentNav("743", "鐢疯"));
- navList.add(new CommonContentNav("13", "姘存灉"));
- navList.add(new CommonContentNav("818", "瀹剁汉"));
- navList.add(new CommonContentNav("2478", "鏂囧叿"));
- navList.add(new CommonContentNav("1451", "杩愬姩"));
- navList.add(new CommonContentNav("590", "铏氭嫙"));
- navList.add(new CommonContentNav("2048", "姹借溅"));
- navList.add(new CommonContentNav("1917", "瀹惰"));
- navList.add(new CommonContentNav("2974", "瀹跺叿"));
- navList.add(new CommonContentNav("3279", "鍖昏嵂"));
+ if (type == PDDCommonContentTypeEnum.hotSaleGoods) {
+
}
return navList;
}
--
Gitblit v1.8.0