From c6b718c3cadf5e5fff4c2a47fd1247842439f8c7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 10:45:18 +0800
Subject: [PATCH] 团队消息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java |   92 +++++++++++++++++++++++-----------------------
 1 files changed, 46 insertions(+), 46 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 9832eee..ec7d8a1 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
@@ -24,8 +24,10 @@
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.homemodule.Special;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
@@ -46,11 +48,11 @@
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 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.service.inter.taobao.dataoke.DaTaoKeGoodsService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
@@ -96,9 +98,6 @@
 
 	@Resource
 	private QualityFlashSaleService qualityFlashSaleService;
-
-	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
 
 	@Resource
 	private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
@@ -149,7 +148,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);
@@ -162,7 +163,8 @@
 					&& 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) {
@@ -173,7 +175,7 @@
 			// 4銆両OS鐨勫簳閮ㄧ綉椤甸摼鎺�
 			String platform = acceptData.getPlatform();
 			if ("ios".equalsIgnoreCase(platform)) {
-				root.put("htmlLink", configService.get("index_html_link_ios"));
+				root.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkIos.getKey()));
 			}
 
 			root.put("spikeGoods", getSpikeGoodsContent(acceptData));
@@ -228,13 +230,15 @@
 
 		long nextTime = nowTime + 1000 * 60 * 60L;// 榛樿涓�1灏忔椂
 		if (nextPos < dtoList.size()) {
-			nextTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos).getTime(),
-					"yyyyMMddHH");
+			nextTime = TimeUtil.convertToTimeTemp(
+					TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos).getTime(), "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());
+		String timekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsHourNew,acceptData.getPlatform() +"-"+acceptData.getVersion());
+		String cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsListNew,acceptData.getPlatform() +"-"+acceptData.getVersion());
+
+		
 		Calendar nowCalendar = Calendar.getInstance();
 		nowCalendar.setTimeInMillis(nowTime);
 		int hour = nowCalendar.get(Calendar.HOUR_OF_DAY);
@@ -276,16 +280,18 @@
 
 			/* 閬嶅巻鍒楄〃鏁版嵁 */
 
+			ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+					acceptData.getVersion());
+
 			for (DaTaoKeDetailV2 detail : listGoods) {
 				TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);
 				if (taoBaoGoodsBrief == null) {
 					continue;
 				}
-				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,
-						new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()));
+				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, configParamsDTO);
 
 				JSONObject params = new JSONObject();
-				params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());
+				params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()) + "?id=" + taoBaoGoodsBrief.getAuctionId());
 
 				JSONObject goods = new JSONObject();
 				goods.put("goods", gson.toJson(detailVO));
@@ -320,7 +326,7 @@
 				}
 			root.put("imgList", imgArray);
 			JSONObject params = new JSONObject();
-			params.put("url", configService.get("spike_goods_link"));
+			params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));
 			root.put("params", params);
 			root.put("jumpDetail", jumpDetail);
 			root.put("name", "闄愭椂绉掓潃");
@@ -330,7 +336,7 @@
 			root.put("endTime", endTime > 0 ? endTime : 0);
 			root.put("listgoods", array);
 			JSONObject params = new JSONObject();
-			params.put("url", configService.get("spike_goods_link"));
+			params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));
 			root.put("params", params);
 			root.put("jumpDetail", jumpDetail);
 		}
@@ -357,8 +363,7 @@
 		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");
+			spikeTime1.setTime(timeList.get(i).getTime().subSequence(2, 4) + ":00");
 			if (timeList.get(i).getState() <= 0)
 				spikeTime1.setState("杩涜涓�");
 			else
@@ -407,9 +412,8 @@
 		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());
+			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+					acceptData.getVersion());
 
 			for (DaTaoKeDetailV2 detail : detailList) {
 				array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), paramsDTO)));
@@ -471,7 +475,7 @@
 		}
 
 		JSONObject params = new JSONObject();
-		params.put("url", configService.get("search_discovery_h5_link"));
+		params.put("url", configService.get(ConfigKeyEnum.searchDiscoveryH5Link.getKey()));
 
 		JSONObject root = new JSONObject();
 		root.put("picture", "http://img.flqapp.com/resource/home_search_found.png");
@@ -553,9 +557,8 @@
 				}
 			}
 
-			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-			BigDecimal shareRate = hongBaoManageService.getShareRate();
-			ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+					acceptData.getVersion());
 
 			for (TaoBaoGoodsBrief goods : goodsList) {
 				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
@@ -573,7 +576,8 @@
 				List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
 				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());
+					ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE,
+							hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
 					for (int i = list.size() - 1; i >= 0; i--) {
 						TLJBuyGoods goods = list.get(i);
 						GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);
@@ -612,7 +616,7 @@
 			if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
 				long startTime = java.lang.System.currentTimeMillis();
 
-				TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);
+				TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa,"");
 
 				if (result != null && result.getTaoBaoGoodsBriefs() != null) {
 					// 绛涢��
@@ -623,15 +627,14 @@
 
 					// filter
 					try {
-						gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
+						gList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(gList);
 					} catch (Exception e) {
 					}
 
 					// 璁惧鎺ㄨ崘
 					if (gList != null) {
-						BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-						BigDecimal shareRate = hongBaoManageService.getShareRate();
-						ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+						ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+								acceptData.getVersion());
 						for (TaoBaoGoodsBrief goods : gList) {
 							if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
 									&& goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
@@ -666,10 +669,10 @@
 					}
 				}
 			}
-			JSONArray localArray = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);
+			JSONArray localArray = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize,acceptData.getPlatform(),acceptData.getVersion());
 			array.addAll(localArray);
 		} else {// 浠庣簿閫夊簱鏉�
-			array = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);
+			array = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize,acceptData.getPlatform(),acceptData.getVersion());
 			if (array == null) {
 				out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
 				return;
@@ -702,9 +705,8 @@
 
 			List<JDGoods> goodsList = result.getGoodsList();
 			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());
+				ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+						acceptData.getVersion());
 
 				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -736,9 +738,8 @@
 			Gson gson = JsonUtil.getApiCommonGson();
 			List<PDDGoodsDetail> goodsList = result.getGoodsList();
 			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());
+				ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+						acceptData.getVersion());
 
 				for (PDDGoodsDetail goods : goodsList) {
 					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
@@ -771,9 +772,8 @@
 			JSONArray arrayKeys = JSONArray.fromObject(keys);
 			if (arrayKeys != null && arrayKeys.size() > 0) {
 				count = arrayKeys.size();
-				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-				BigDecimal shareRate = hongBaoManageService.getShareRate();
-				ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+				ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+						acceptData.getVersion());
 
 				int j = 1;
 				for (int i = (page - 1) * 3; i < arrayKeys.size(); i++) {
@@ -876,7 +876,7 @@
 	public void getGuide(AcceptData acceptData, Long uid, PrintWriter out) {
 		String tips = null;
 		if (uid == null || uid <= 0) {
-			tips = configService.get("tip_guide_new_user");
+			tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
 		} else {
 			long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);
 			long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);
@@ -884,13 +884,13 @@
 				// 鐔熷鐗�
 			} else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {
 				// 鏂颁汉鐗�
-				tips = configService.get("tip_guide_new_user");
+				tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
 			} else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {
 				// 鐪侀挶鐗�
-				tips = configService.get("tip_guide_save_money");
+				tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());
 			} else {
 				// 璧氶挶鐗�
-				tips = configService.get("tip_guide_share_invite");
+				tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());
 			}
 		}
 

--
Gitblit v1.8.0