From 4c31405418bdd063605f1e5821d99f85be02f23c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 19 七月 2019 15:54:12 +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/DaTaoKeGoodsDetailV2ServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 44c471b..e449fa1 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
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -225,13 +226,29 @@
@Override
public List<DaTaoKeDetailV2> listPreTLJBuyGoods(int page) {
if (page == 1) {
- DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_DAY, null);
+ 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 (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0)
- goodsList.add(v2);
+
+ if (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0
+ && v2.getActualPrice().compareTo(new BigDecimal(30)) < 0 && v2.getMonthSales() >= 5000) {
+ Date time = new Date(TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"));
+
+ Date targetTime = new Date(TimeUtil
+ .convertToTimeTemp(TimeUtil.getGernalTime(
+ System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2L, "yyyy-MM-dd"), "yyyy-MM-dd")
+ - 1000L);
+ // 濡傛灉鏄噷鏅ㄩ�夋嫨鐨�
+ if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) < 12) {// 涓婂崍閫夋嫨鐨勮绠椾负褰撳ぉ鐨�
+ targetTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(
+ System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 1L, "yyyy-MM-dd"), "yyyy-MM-dd")
+ - 1000L);
+ }
+ if (time.getTime() >= targetTime.getTime())
+ goodsList.add(v2);
+ }
}
return goodsList;
} else
--
Gitblit v1.8.0