From 84c07b26025cb0790d089b0d397f80b941bcdf88 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 03 八月 2019 10:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 df589a5..be88257 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
@@ -10,6 +10,7 @@
import com.yeshi.fanli.dto.common.CommonContentNav;
import com.yeshi.fanli.dto.common.PDDCommonContentTypeEnum;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;
import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
@@ -29,7 +30,25 @@
|| type == PDDCommonContentTypeEnum.brandClear) {
return PinDuoDuoApiUtil.searchByChannelType(page - 1, pageSize, type.getContent());
} else if (type == PDDCommonContentTypeEnum.hotSaleGoods) {
- return pddGoodsService.getTopGoodsList(page, 2);
+ return pddGoodsService.getTopGoodsList(page, 2); // 鐑崠濂借揣
+ } else if (type == PDDCommonContentTypeEnum.todaySaleGoods) { // 鐑攢姒滃崟
+ int count = 0;
+ List<PDDGoodsDetail> list = new ArrayList<PDDGoodsDetail>();
+ PDDGoodsResult pddGoodsResult = pddGoodsService.getTodaySaleGoodsList();
+ if (pddGoodsResult != null) {
+ List<PDDGoodsDetail> goodsList = pddGoodsResult.getGoodsList();
+ if (goodsList != null) {
+ if (goodsList.size() >= (page * pageSize)) {
+ list.addAll(goodsList.subList((page-1)* pageSize, page * pageSize));
+ }
+ count = goodsList.size();
+ }
+ }
+ PDDGoodsResult pddResult = new PDDGoodsResult();
+ pddResult.setGoodsList(list);
+ pddResult.setTotalCount(count);
+
+ return pddResult;
}
return null;
}
--
Gitblit v1.8.0