From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java |  156 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 111 insertions(+), 45 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index eb27792..8424964 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -21,12 +21,12 @@
 import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
-import com.yeshi.fanli.entity.bus.lable.QualityFactory;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -41,15 +41,19 @@
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
 import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.VersionUtil;
 import com.yeshi.fanli.util.factory.MonitorFactory;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
+import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -109,6 +113,12 @@
 	@Resource
 	private PDDGoodsService pddGoodsService;
 
+	@Resource
+	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
+	@Resource
+	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
 	/**
 	 * 鏂扮増鎺ㄨ崘涓撻绠$悊(1.5.3)
 	 * 
@@ -125,10 +135,16 @@
 			JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
 
 			// 2銆侀《閮ㄨ疆鎾浘
-			List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("index_top");
-			if (topPicList == null) {
-				topPicList = new ArrayList<SwiperPicture>();
+			List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");
+			List<SwiperPicture> topPicList = new ArrayList<>();
+			if (oldtopPicList != null && oldtopPicList.size() > 0)
+				topPicList.addAll(oldtopPicList);
+			if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+				SwiperPicture notifyReName = swiperPictureService.selectByPrimaryKey(162L);
+				if (notifyReName != null)
+					topPicList.add(0, notifyReName);
 			}
+
 			root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
 
 			// 3銆侀個璇锋湁濂�
@@ -152,6 +168,8 @@
 			}
 
 			root.put("spikeGoods", getSpikeGoodsContent(acceptData));
+			if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
+				root.put("scoreExchange", getScoreExchangeInfo(acceptData));
 
 			out.print(JsonUtil.loadTrueResult(root));
 		} catch (Exception e) {
@@ -177,44 +195,33 @@
 	}
 
 	private JSONObject getSpikeGoodsContent(AcceptData acceptData) {
-		// 涓嬩竴娆″�掕鏃剁殑鏃堕棿
-		int type = qualityFlashSaleService.getNowType() + 1;
-		int hour = 0;
-		switch (type) {
-		case 1:
-			hour = 0;
-			break;
-		case 2:
-			hour = 9;
-			break;
-		case 3:
-			hour = 12;
-			break;
-		case 4:
-			hour = 14;
-			break;
-		case 5:
-			hour = 16;
-			break;
-		case 6:
-			hour = 20;
-			break;
-		case 7:
-			hour = 22;
-			break;
-		default:
-			break;
+		List<String> dtoList = DaTaoKeUtil.getDingDongQiangTime();
+		long nowTime = System.currentTimeMillis();
+		int dateNum = Integer.parseInt(TimeUtil.getGernalTime(nowTime, "ddHH"));
+		String timeStr = null;
+		int nextPos = 0;
+		for (int i = 0; i < dtoList.size() - 1; i++) {
+			if (dateNum >= Integer.parseInt(dtoList.get(i)) && dateNum < Integer.parseInt(dtoList.get(i + 1))) {
+				timeStr = dtoList.get(i);
+				nextPos = i + 1;
+				break;
+			}
 		}
+		if (timeStr == null)
+			timeStr = dtoList.get(dtoList.size() - 1);
 
-		Calendar nextTime = Calendar.getInstance();
-		nextTime.set(Calendar.HOUR_OF_DAY, hour);
-		nextTime.set(Calendar.MINUTE, 0);
-		nextTime.set(Calendar.SECOND, 0);
-		nextTime.set(Calendar.MILLISECOND, 0);
+		long nextTime = nowTime + 1000 * 60 * 60L;// 榛樿涓�1灏忔椂
+		if (nextPos < dtoList.size()) {
+			nextTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos),
+					"yyyyMMddHH");
+		}
 
 		JSONArray array = null;
 		String timekey = String.format("spikeGoods_hour_new-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
 		String cachekey = String.format("spikeGoodsList_new-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
+		Calendar nowCalendar = Calendar.getInstance();
+		nowCalendar.setTimeInMillis(nowTime);
+		int hour = nowCalendar.get(Calendar.HOUR_OF_DAY);
 
 		String timeValue = redisManager.getCommonString(timekey);
 		if (timeValue == null || !timeValue.equals(hour + "")) {
@@ -225,6 +232,7 @@
 				array = JSONArray.fromObject(cacheValue);
 			}
 		}
+
 		JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
 		if (array == null) {
 			array = new JSONArray();
@@ -236,15 +244,18 @@
 					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 
 			// 缂撳瓨涓笉瀛樺湪
-			List<QualityFactory> listGoods = qualityGoodsService.listFlashSaleRandGoods();
+			List<DaTaoKeDetailV2> listGoods = daTaoKeGoodsDetailV2Service.getDingDongQiangData(timeStr);
 			if (listGoods == null) {
-				listGoods = new ArrayList<QualityFactory>();
+				listGoods = new ArrayList<>();
 			}
+
+			if (listGoods != null && listGoods.size() > 3)
+				listGoods = listGoods.subList(0, 3);
 
 			/* 閬嶅巻鍒楄〃鏁版嵁 */
 
-			for (QualityFactory qualityFactory : listGoods) {
-				TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();
+			for (DaTaoKeDetailV2 detail : listGoods) {
+				TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);
 				if (taoBaoGoodsBrief == null) {
 					continue;
 				}
@@ -270,19 +281,67 @@
 			// 缂撳瓨鍗婁釜灏忔椂
 			redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
 		}
-		Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
+
+		// 鑾峰彇浠婂ぉ鐨勬暟鎹�
+
+		Long endTime = nextTime - nowTime;
 
 		JSONObject root = new JSONObject();
-		root.put("time", nextTime.getTimeInMillis());
+
+		if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+			root.put("time", nextTime);
+			root.put("endTime", endTime > 0 ? endTime : 0);
+			JSONArray imgArray = new JSONArray();
+			if (array != null)
+				for (int i = 0; i < array.size(); i++) {
+					imgArray.add(array.optJSONObject(i).optJSONObject("goods").optString("picUrl"));
+				}
+			root.put("imgList", imgArray);
+			JSONObject params = new JSONObject();
+			params.put("url", configService.get("spike_goods_link"));
+			root.put("params", params);
+			root.put("jumpDetail", jumpDetail);
+			root.put("name", "闄愭椂绉掓潃");
+			root.put("desc", "鏁寸偣鏇存柊锛屽ソ鐗╂姠璐�");
+		} else {
+			root.put("time", nextTime);
+			root.put("endTime", endTime > 0 ? endTime : 0);
+			root.put("listgoods", array);
+			JSONObject params = new JSONObject();
+			params.put("url", configService.get("spike_goods_link"));
+			root.put("params", params);
+			root.put("jumpDetail", jumpDetail);
+		}
+
+		root.put("time", nextTime);
 		root.put("endTime", endTime > 0 ? endTime : 0);
 		root.put("listgoods", array);
 
+		return root;
+	}
+
+	/**
+	 * 閲戝竵鍏戞崲淇℃伅
+	 * 
+	 * @param acceptData
+	 * @return
+	 */
+	private JSONObject getScoreExchangeInfo(AcceptData acceptData) {
+
+		JSONObject root = new JSONObject();
+		JSONArray array = new JSONArray();
+		array.add("http://img.flqapp.com/resource/integral/integral_home_icon_2.png");
+		array.add("http://img.flqapp.com/resource/integral/integral_home_icon_1.png");
+		root.put("imgList", array);
 		JSONObject params = new JSONObject();
-		params.put("url", configService.get("spike_goods_link"));
-
+		params.put("balanceMore", true);
 		root.put("params", params);
-		root.put("jumpDetail", jumpDetail);
+		root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("integralExchange",
+				Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
 
+		root.put("name", "閲戝竵鍏戞崲");
+		root.put("desc", "姣忔棩绛惧埌锛屾儕鍠滀笉鍋�");
+		root.put("tagImg", "http://img.flqapp.com/resource/score_exchange_tag.png");
 		return root;
 	}
 
@@ -347,6 +406,13 @@
 			List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),
 					imei, idfa, page);
 
+			if (page < 4) {// 鍓嶄笁椤靛姞鍏ユ洿鏂�
+				try {
+					taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);
+				} catch (Exception e) {
+				}
+			}
+
 			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 			BigDecimal shareRate = hongBaoManageService.getShareRate();
 			for (TaoBaoGoodsBrief goods : goodsList) {

--
Gitblit v1.8.0