From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java
index b3369eb..d5e29b5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -109,7 +110,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Cacheable(value = "pddSpecialCache", key = "'specialSearch-'+#page+'-'+#cid")
public List<PDDGoodsDetail> specialSearch(Integer page, Long cid) throws PDDOrderException {
if (cid == null) {
@@ -172,7 +173,16 @@
@Override
@Cacheable(value = "pddSpecialCache", key = "'getTopGoodsList-' + #page + '-' + #sortType")
public PDDGoodsResult getTopGoodsList(int page, Integer sortType) {
- return PinDuoDuoApiUtil.getTopList(PinDuoDuoApiUtil.PID_FANLI, page, Constant.PAGE_SIZE, sortType);
+ PDDGoodsResult pddResult = PinDuoDuoApiUtil.getTopList(PinDuoDuoApiUtil.PID_FANLI, page, Constant.PAGE_SIZE,
+ sortType);
+ if (pddResult != null && pddResult.getGoodsList() != null)
+ Collections.shuffle(pddResult.getGoodsList());
+ return pddResult;
}
+ @Override
+ @Cacheable(value = "pddSpecialCache", key = "'getTodaySaleGoodsList-'")
+ public PDDGoodsResult getTodaySaleGoodsList() {
+ return PinDuoDuoUtil.getTodaySaleGoods();
+ }
}
--
Gitblit v1.8.0