From 00ae1ad282df5afa8205c11e86755ff311402ece Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 八月 2019 11:08:23 +0800
Subject: [PATCH] 淘礼金规则修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 21b0ddd..b644bbd 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
@@ -28,6 +28,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@Service
public class DaTaoKeGoodsDetailV2ServiceImpl implements DaTaoKeGoodsDetailV2Service {
@@ -240,17 +241,25 @@
return finalList;
}
+ private boolean canAddToTLJBuyGoods(DaTaoKeDetailV2 v2) {
+ return TaoBaoUtil.canAddToTLJBuyGoods(TaoBaoUtil.convert(v2));
+ }
+
@Override
public List<DaTaoKeDetailV2> listPreTLJBuyGoods(int page) {
if (page == 1) {
+ List<DaTaoKeDetailV2> listPreGoodsList = new ArrayList<>();
DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_HOT, null);
- List<DaTaoKeDetailV2> goodsList = new ArrayList<>();
- for (DaTaoKeDetailV2 v2 : result.getGoodsList()) {
- BigDecimal commision = MoneyBigDecimalUtil
- .div(MoneyBigDecimalUtil.mul(v2.getActualPrice(), v2.getCommissionRate()), new BigDecimal(100));
+ if (result != null && result.getGoodsList() != null)
+ listPreGoodsList.addAll(result.getGoodsList());
- if (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0
- && v2.getActualPrice().compareTo(new BigDecimal(30)) < 0 && v2.getMonthSales() >= 5000) {
+ result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_REBUY, null);
+ if (result != null && result.getGoodsList() != null)
+ listPreGoodsList.addAll(result.getGoodsList());
+
+ List<DaTaoKeDetailV2> goodsList = new ArrayList<>();
+ for (DaTaoKeDetailV2 v2 : listPreGoodsList) {
+ if (canAddToTLJBuyGoods(v2)) {
Date time = new Date(TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"));
Date targetTime = new Date(TimeUtil
@@ -267,6 +276,24 @@
goodsList.add(v2);
}
}
+
+ // 鍘婚噸
+ Map<Long, DaTaoKeDetailV2> goodsMap = new HashMap<>();
+ for (DaTaoKeDetailV2 v2 : goodsList) {
+ goodsMap.put(v2.getGoodsId(), v2);
+ }
+ goodsList.clear();
+ for (Iterator<Long> its = goodsMap.keySet().iterator(); its.hasNext();) {
+ goodsList.add(goodsMap.get(its.next()));
+ }
+ Comparator<DaTaoKeDetailV2> cm = new Comparator<DaTaoKeDetailV2>() {
+
+ @Override
+ public int compare(DaTaoKeDetailV2 o1, DaTaoKeDetailV2 o2) {
+ return o1.getActualPrice().compareTo(o2.getActualPrice());
+ }
+ };
+ Collections.sort(goodsList, cm);
return goodsList;
} else
return new ArrayList<>();
--
Gitblit v1.8.0