From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java |  159 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 127 insertions(+), 32 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 4c6d10f..9f37b51 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
@@ -16,6 +16,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.dataoke.DingDongTime;
 import com.yeshi.fanli.dto.jd.JDSearchResult;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
@@ -61,6 +63,7 @@
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 import com.yeshi.fanli.vo.goods.OtherInfo;
+import com.yeshi.fanli.vo.goods.SpikeTimeVO;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 import com.yeshi.fanli.vo.search.SearchKeyTOPVO;
 import com.yeshi.fanli.vo.search.SearchKeyVO;
@@ -126,11 +129,9 @@
 
 	@Resource
 	private DaTaoKeGoodsService daTaoKeGoodsService;
-	
+
 	@Resource
 	private HongBaoV2CountService hongBaoV2CountService;
-	
-	
 
 	/**
 	 * 鏂扮増鎺ㄨ崘涓撻绠$悊(1.5.3)
@@ -148,7 +149,9 @@
 			JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
 
 			// 2銆侀《閮ㄨ疆鎾浘
-			List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");
+			List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+			
+			
 			List<SwiperPicture> topPicList = new ArrayList<>();
 			if (oldtopPicList != null && oldtopPicList.size() > 0)
 				topPicList.addAll(oldtopPicList);
@@ -161,7 +164,7 @@
 					&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
 				// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
 			} else {
-				invitePicList = swiperPictureService.getByBannerCard("index_invite");
+				invitePicList = swiperPictureService.getByBannerCardAndVersion("index_invite",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
 			}
 
 			if (invitePicList == null) {
@@ -207,26 +210,27 @@
 
 	private JSONObject getSpikeGoodsContent(AcceptData acceptData) {
 		long nowTime = System.currentTimeMillis();
-		Calendar calendar=	Calendar.getInstance(); 
+		Calendar calendar = Calendar.getInstance();
 		calendar.setTimeInMillis(nowTime);
-		List<String> dtoList = DaTaoKeUtil.getDingDongQiangTime(calendar);	
+		List<DingDongTime> dtoList = DaTaoKeUtil.getDingDongQiangTime(calendar);
 		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);
+			if (dateNum >= Integer.parseInt(dtoList.get(i).getTime())
+					&& dateNum < Integer.parseInt(dtoList.get(i + 1).getTime())) {
+				timeStr = dtoList.get(i).getTime();
 				nextPos = i + 1;
 				break;
 			}
 		}
-		
+
 		if (timeStr == null)
-			timeStr = dtoList.get(dtoList.size() - 1);
+			timeStr = dtoList.get(dtoList.size() - 1).getTime();
 
 		long nextTime = nowTime + 1000 * 60 * 60L;// 榛樿涓�1灏忔椂
 		if (nextPos < dtoList.size()) {
-			nextTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos),
+			nextTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos).getTime(),
 					"yyyyMMddHH");
 		}
 
@@ -247,7 +251,13 @@
 			}
 		}
 
-		JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+		JumpDetailV2 jumpDetail = null;
+		if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+			jumpDetail = jumpDetailV2Service.getByTypeCache("spike_goods_list");
+		} else {
+			jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+		}
+
 		if (array == null) {
 			array = new JSONArray();
 
@@ -273,8 +283,8 @@
 				if (taoBaoGoodsBrief == null) {
 					continue;
 				}
-				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,
-						shareRate);
+				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,
+						new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()));
 
 				JSONObject params = new JSONObject();
 				params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());
@@ -332,6 +342,86 @@
 		root.put("listgoods", array);
 
 		return root;
+	}
+
+	/**
+	 * 闄愭椂绉掓潃鍒楄〃
+	 * 
+	 * @param acceptData
+	 * @param page
+	 * @param auctionId
+	 * @param time
+	 * @param out
+	 */
+	@RequestMapping("getSpikTime")
+	public void getSpikTime(AcceptData acceptData, PrintWriter out) {
+		List<DingDongTime> timeList = DaTaoKeUtil.getDingDongQiangTime(Calendar.getInstance());
+		List<SpikeTimeVO> list = new ArrayList<SpikeTimeVO>();
+		for (int i = 0; i < timeList.size(); i++) {
+			SpikeTimeVO spikeTime1 = new SpikeTimeVO();
+			spikeTime1.setTime(
+					 timeList.get(i).getTime().subSequence(2, 4)+":00");
+			if (timeList.get(i).getState() <= 0)
+				spikeTime1.setState("杩涜涓�");
+			else
+				spikeTime1.setState("鍗冲皢寮�濮�");
+			if (timeList.get(i).getState() == 0)
+				spikeTime1.setChecked(true);
+			spikeTime1.setRequestTime(timeList.get(i).getTime());
+			list.add(spikeTime1);
+		}
+
+		JSONObject data = new JSONObject();
+		data.put("count", list.size());
+		data.put("list", list);
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+
+	/**
+	 * 闄愭椂绉掓潃鍒楄〃
+	 * 
+	 * @param acceptData
+	 * @param page
+	 * @param auctionId
+	 * @param time
+	 * @param out
+	 */
+	@RequestMapping("getSpikeGoodsList")
+	public void getSpikeGoodsList(AcceptData acceptData, Integer page, Long goodsId, String qtime, PrintWriter out) {
+		List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(qtime);
+		if (detailList0 == null)
+			detailList0 = new ArrayList<>();
+
+		List<DaTaoKeDetailV2> detailList = new ArrayList<>();
+		detailList.addAll(detailList0);
+		JSONArray array = new JSONArray();
+		if (page == 1 && goodsId != null && detailList != null) {
+			for (int i = 0; i < detailList.size(); i++) {
+				if (detailList.get(i).getGoodsId().longValue() == goodsId) {
+					DaTaoKeDetailV2 goods = detailList.get(i);
+					detailList.remove(i);
+					detailList.add(0, goods);
+					break;
+				}
+			}
+		}
+
+		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+		if (detailList != null) {
+			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+			BigDecimal shareRate = hongBaoManageService.getShareRate();
+			ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+
+			for (DaTaoKeDetailV2 detail : detailList) {
+				array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), paramsDTO)));
+			}
+		}
+
+		JSONObject data = new JSONObject();
+		data.put("count", detailList.size());
+		data.put("list", array);
+		out.print(JsonUtil.loadTrueResult(data));
 	}
 
 	/**
@@ -467,8 +557,10 @@
 
 			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 			BigDecimal shareRate = hongBaoManageService.getShareRate();
+			ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+
 			for (TaoBaoGoodsBrief goods : goodsList) {
-				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
+				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
 				if (page < 3)
 					detailVO.setRecommend(true);
 
@@ -481,12 +573,12 @@
 
 			if (page == 1) {
 				List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
-				if (list != null && list.size() > 0)
+				if (list != null && list.size() > 0) {
+					BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
+					ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 					for (int i = list.size() - 1; i >= 0; i--) {
 						TLJBuyGoods goods = list.get(i);
-						BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
-						GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), null, rateBuy,
-								rateBuy);
+						GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);
 
 						String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
 								TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
@@ -506,6 +598,7 @@
 						detailVO.setRecommend(true);
 						array.add(0, gson.toJson(detailVO));
 					}
+				}
 			}
 
 			JSONObject data = new JSONObject();
@@ -540,15 +633,14 @@
 					if (gList != null) {
 						BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 						BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+						ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 						for (TaoBaoGoodsBrief goods : gList) {
 							if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
 									&& goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
 									&& goods.getBiz30day() > 1000
 									&& !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
 
-								GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate,
-										shareRate);
+								GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
 								detailVO.setRecommend(true);
 								goodsList.add(detailVO);
 							}
@@ -614,10 +706,12 @@
 			if (goodsList != null && goodsList.size() > 0) {
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
+				ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+
 				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 				for (JDGoods goods : goodsList) {
-					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
 					array.add(gson.toJson(goodsDetailVO));
 				}
 			}
@@ -646,9 +740,10 @@
 			if (goodsList != null && goodsList.size() > 0) {
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
+				ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 
 				for (PDDGoodsDetail goods : goodsList) {
-					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
 					array.add(gson.toJson(goodsDetailVO));
 				}
 			}
@@ -680,6 +775,7 @@
 				count = arrayKeys.size();
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
+				ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 
 				int j = 1;
 				for (int i = (page - 1) * 3; i < arrayKeys.size(); i++) {
@@ -692,8 +788,8 @@
 					List<DaTaoKeDetailV2> listTaoKe = daTaoKeGoodsService.getSearchDiscoveryGoods(words);
 					if (listTaoKe != null && listTaoKe.size() > 0) {
 						for (DaTaoKeDetailV2 daTaoKeDetailV2 : listTaoKe) {
-							listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), null,
-									fanLiRate, shareRate));
+							listGoods.add(
+									GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), paramsDTO));
 							if (listGoods.size() >= 3)
 								break;
 						}
@@ -747,7 +843,7 @@
 					special.setTimeTask(true);
 				else
 					special.setTimeTask(false);
-				
+
 				if (special.isTimeTask()) {
 					if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
 						list.remove(i--);
@@ -770,7 +866,6 @@
 			out.print(JsonUtil.loadTrueResult(data));
 	}
 
-	
 	/**
 	 * 鑾峰彇涓撻娓犻亾娲诲姩
 	 * 
@@ -798,14 +893,14 @@
 			} else {
 				// 璧氶挶鐗�
 				tips = configService.get("tip_guide_share_invite");
-			} 
+			}
 		}
-		
+
 		if (StringUtil.isNullOrEmpty(tips)) {
 			out.print(JsonUtil.loadFalseResult("鏆傛棤鎻愮ず"));
 			return;
 		}
-		
+
 		JSONObject data = JSONObject.fromObject(tips);
 		out.print(JsonUtil.loadTrueResult(data));
 	}

--
Gitblit v1.8.0