From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
index 87078e9..cdad78e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
@@ -252,11 +252,23 @@
public List<DaTaoKeDetailV2> listPreTLJBuyGoods(int page) {
if (page == 1) {
List<DaTaoKeDetailV2> listPreGoodsList = new ArrayList<>();
+ // 鐑攢姒�
DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_HOT, null);
if (result != null && result.getGoodsList() != null)
listPreGoodsList.addAll(result.getGoodsList());
-
+ // 澶嶈喘姒�
result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_REBUY, null);
+ if (result != null && result.getGoodsList() != null)
+ listPreGoodsList.addAll(result.getGoodsList());
+ // 缁煎悎鎼滅储
+ try {
+ result = DaTaoKeApiUtil.search("", null, null, null, 1, 200, DaTaoKeApiUtil.SORT_DEFAULT);
+ if (result == null)
+ throw new Exception();
+ } catch (Exception e) {// 寮傚父閲嶅涓�娆�
+ result = DaTaoKeApiUtil.search("", null, null, null, 1, 200, DaTaoKeApiUtil.SORT_DEFAULT);
+ }
+
if (result != null && result.getGoodsList() != null)
listPreGoodsList.addAll(result.getGoodsList());
@@ -333,12 +345,32 @@
daTaoKeGoodsDetailV2Dao.save(v2);
}
+ private List<DaTaoKeDetailV2> getDefaultDingDongQiang() {
+ // 鎸夋洿鏂版椂闂村姞
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_TIME, null);
+ if (result != null && result.getGoodsList().size() > 0) {
+ List<DaTaoKeDetailV2> finalList = new ArrayList<>();
+ Collections.shuffle(result.getGoodsList());
+ finalList.addAll(result.getGoodsList().subList(0,
+ result.getGoodsList().size() > 8 ? 8 : result.getGoodsList().size()));
+ for (DaTaoKeDetailV2 detail : finalList) {
+ detail.setCouponReceiveNum(detail.getCouponTotalNum() - (int) (200 + Math.random() * 1000));
+ if (detail.getCouponTotalNum() - detail.getCouponReceiveNum() <= 0)
+ detail.setCouponReceiveNum(detail.getCouponTotalNum());
+ }
+ return finalList;
+ }
+ return null;
+ }
+
@Cacheable(value = "daTaoKeGoodsCache", key = "'getDingDongQiangData-'+#time")
@Override
public List<DaTaoKeDetailV2> getDingDongQiangData(String time) {
List<DingDongQiangDTO> list = getDingDongQiangData();
- if (list == null)
- return null;
+ if (list == null || list.size() == 0) {
+ return getDefaultDingDongQiang();
+ }
+
Map<String, DingDongQiangDTO> map = new HashMap<>();
for (DingDongQiangDTO dto : list)
map.put(dto.getTime(), dto);
@@ -372,8 +404,9 @@
detail.setCouponReceiveNum(detail.getCouponTotalNum());
}
return finalList;
+ } else {
+ return getDefaultDingDongQiang();
}
- return null;
}
@Override
--
Gitblit v1.8.0