From 659ecb86b75e24c95ab2edc9a056fdd6f7d90a91 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 11:09:28 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java | 44 --------------------------------------------
1 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
index 914f5f6..d4a45e3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
@@ -153,19 +153,6 @@
return daTaoKeDetailMapper.countByCidAndMaxMinPrice(cid, maxPrice, null);
}
- @Cacheable(value = "daTaoKeGoodsCache", key = "'getDingDongQiangData'")
- @Override
- public List<DingDongQiangDTO> getDingDongQiangData() {
- List<DingDongQiangDTO> list = null;
- int count = 0;
- while ((list == null || list.size() == 0) && count < 3) {
- count++;
- list = DaTaoKeUtil.getDingDongQiang();
- }
- if (list == null)
- return null;
- return list;
- }
private void updateGoods(Long id) {
DaTaoKeDetail detail = daTaoKeDetailMapper.selectByPrimaryKey(id);
@@ -177,37 +164,6 @@
list.add(detail);
addGoodsList(list);
}
- }
-
- @Cacheable(value = "daTaoKeGoodsCache", key = "'getDingDongQiangData-'+#time")
- @Override
- public List<DaTaoKeDetail> getDingDongQiangData(String time) {
- List<DingDongQiangDTO> list = getDingDongQiangData();
- if (list == null)
- return null;
- Map<String, DingDongQiangDTO> map = new HashMap<>();
- for (DingDongQiangDTO dto : list)
- map.put(dto.getTime(), dto);
-
- DingDongQiangDTO dto = map.get(time);
- if (dto != null) {
- List<Long> idList = new ArrayList<>();
- for (DaTaoKeDetail td : dto.getGoodsList())
- idList.add(td.getId());
- List<DaTaoKeDetail> finalList = listByIds(idList);
- if (finalList.size() != idList.size()) {
- for (Long id : idList)
- updateGoods(id);
- finalList = listByIds(idList);
- }
-
- for (DaTaoKeDetail detail : finalList) {
- detail.setQuanReceive(
- detail.getQuanSurplus() + detail.getQuanReceive() - (int) (200 + Math.random() * 1000));
- }
- return finalList;
- }
- return null;
}
}
--
Gitblit v1.8.0