From 52f78c29b978f65cc704be546c814509fbe90cda Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@CI6BUF61FT24H5M>
Date: 星期日, 21 七月 2019 11:38:12 +0800
Subject: [PATCH] 查询用户淘宝授权信息禁止查询缓存

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 45 insertions(+), 5 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 f8c1c57..45b4022 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
@@ -1,6 +1,8 @@
 package com.yeshi.fanli.service.impl.taobao.dataoke;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -21,6 +23,8 @@
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.util.BeanUtil;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -189,19 +193,24 @@
 	}
 
 	@Override
-	public List<DaTaoKeDetailV2> listPreShareHotGoods() {
+	public List<DaTaoKeDetailV2> listPreShareHotGoods(int page) {
 		Map<Long, DaTaoKeDetailV2> map = new HashMap<>();
-		List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Dao.listPreShareHotGoods(20, "monthSales");
+		List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Dao.listPreShareHotGoods((page - 1) * Constant.PAGE_SIZE,
+				Constant.PAGE_SIZE, "monthSales");
 		System.out.println(list);
-		list.addAll(daTaoKeGoodsDetailV2Dao.listPreShareHotGoods(20, "twoHoursSales"));
-		list.addAll(daTaoKeGoodsDetailV2Dao.listPreShareHotGoods(20, "dailySales"));
 		for (DaTaoKeDetailV2 v2 : list) {
 			map.put(v2.getId(), v2);
 		}
 
 		List<DaTaoKeDetailV2> finalList = new ArrayList<>();
 		for (Iterator<Long> its = map.keySet().iterator(); its.hasNext();) {
-			finalList.add(map.get(its.next()));
+			DaTaoKeDetailV2 v2 = map.get(its.next());
+			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 (time.getTime() >= targetTime.getTime())
+				finalList.add(v2);
 		}
 
 		Comparator<DaTaoKeDetailV2> cm = new Comparator<DaTaoKeDetailV2>() {
@@ -214,4 +223,35 @@
 		return finalList;
 	}
 
+	@Override
+	public List<DaTaoKeDetailV2> listPreTLJBuyGoods(int page) {
+		if (page == 1) {
+			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
+						&& 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
+			return new ArrayList<>();
+	}
+
 }

--
Gitblit v1.8.0