From dadacf7c1065876248bec86cf17c06ca4be1b97c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 14:55:17 +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 | 358 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 260 insertions(+), 98 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 9aaa35a..6eded12 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,32 +16,46 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.jd.JDSearchResult;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+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.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.goods.recommend.HomeRecommendGoodsService;
import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.jd.JDGoodsService;
import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
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.dataoke.DaTaoKeGoodsDetailService;
+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.VersionUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
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.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.tlj.ReduceHongBao;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -58,6 +72,9 @@
@Resource
private RedisManager redisManager;
+
+ @Resource
+ private HomeRecommendGoodsService homeRecommendGoodsService;
@Resource
private ConfigService configService;
@@ -86,6 +103,12 @@
@Resource
private SwiperPictureService swiperPictureService;
+ @Resource
+ private JDGoodsService jdGoodsService;
+
+ @Resource
+ private PDDGoodsService pddGoodsService;
+
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.5.3)
@@ -142,97 +165,6 @@
}
}
-
-
-
- /**
- * 鏍规嵁璁惧淇℃伅鑾峰彇鐚滀綘鍠滄鐨勫唴瀹�
- *
- * @param acceptData
- * @param imei
- * -Android鐨処MEI淇℃伅
- * @param idfa
- * -IOS鐨刬dfa骞垮憡鏍囪瘑淇℃伅
- */
- @RequestMapping(value = "guessLikeByDevice")
- public void guessUserLikeByDevice(AcceptData acceptData, String imei, String idfa, int page,
- HttpServletRequest request, PrintWriter out) {
- int pageSize = Constant.PAGE_SIZE;
- JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
- // 浠庢帹鑽愭潵
- if (page <= 1) {
- array.clear();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
-
- if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
- long startTime = java.lang.System.currentTimeMillis();
-
- TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);
-
- if (result != null && result.getTaoBaoGoodsBriefs() != null) {
- // 绛涢��
- List<GoodsDetailVO> goodsList = new ArrayList<GoodsDetailVO>();
-
- List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService
- .filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());
-
- // filter
- try {
- gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
- } catch (Exception e) {
- }
-
- // 璁惧鎺ㄨ崘
- if (gList != null)
- 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);
- detailVO.setRecommend(true);
- goodsList.add(detailVO);
- }
- }
- try {
- monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
- (int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size()));
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- Collections.shuffle(goodsList);
- goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;
- for (GoodsDetailVO goods : goodsList) {
- array.add(gson.toJson(goods));
- }
- } else {
- try {
- monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
- (int) (java.lang.System.currentTimeMillis() - startTime), "鏃犳帹鑽�"));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- JSONArray localArray = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);
- array.addAll(localArray);
- } else {// 浠庣簿閫夊簱鏉�
- array = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);
- if (array == null) {
- out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
- return;
- }
- }
-
- JSONObject data = new JSONObject();
- data.put("data", array);
- data.put("count", 1000);
- out.print(JsonUtil.loadTrueResult(data));
- }
/**
@@ -286,8 +218,8 @@
nextTime.set(Calendar.MILLISECOND, 0);
JSONArray array = null;
- String timekey = String.format("spikeGoods_hour-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
- String cachekey = String.format("spikeGoodsList-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
+ 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 timeValue = redisManager.getCommonString(timekey);
if (timeValue == null || !timeValue.equals(hour + "")) {
@@ -361,19 +293,249 @@
/**
- * 浜笢涓撻
+ * 棣栭〉搴曢儴鍟嗗搧鎺ㄨ崘
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getJDSpecial")
- public void getJDSpecial(AcceptData acceptData, PrintWriter out) {
- JSONObject root = getSpikeGoodsContent(acceptData);
- out.print(JsonUtil.loadTrueResult(root));
+ @RequestMapping(value = "getGoodList")
+ public void getGoodList(AcceptData acceptData, Integer goodsType, Integer page, HttpServletRequest request, PrintWriter out) {
+
+ if (goodsType == null || page == null) {
+ out.print(JsonUtil.loadFalseResult("鍙傛暟淇℃伅涓嶆甯�"));
+ return;
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ taoBaoGuessUserLikeByDevice(acceptData, page, request, out);
+ return;
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
+ getIndexJDGoods(acceptData, page, out);
+ return;
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_PDD) {
+ getIndexPDDGoods(acceptData, page, out);
+ return;
+ }
+ out.print(JsonUtil.loadFalseResult("鍟嗗搧绫诲瀷閿欒"));
+ }
+
+
+
+ /**
+ * 鏍规嵁璁惧淇℃伅鑾峰彇鐚滀綘鍠滄鐨勫唴瀹�
+ *
+ * @param acceptData
+ * @param imei
+ * -Android鐨処MEI淇℃伅
+ * @param idfa
+ * -IOS鐨刬dfa骞垮憡鏍囪瘑淇℃伅
+ */
+ public void taoBaoGuessUserLikeByDevice(AcceptData acceptData, int page, HttpServletRequest request, PrintWriter out) {
+ int pageSize = Constant.PAGE_SIZE;
+ JSONArray array = new JSONArray();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
+
+ String idfa = acceptData.getIdfa();
+ String imei = acceptData.getImei();
+ if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion())) {
+ List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),
+ imei, idfa, page);
+
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
+ if (page < 3)
+ detailVO.setRecommend(true);
+
+ try {
+ array.add(gson.toJson(detailVO));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ if (page == 1) {
+ List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
+ if (list != null && list.size() > 0)
+ 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);
+
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+
+ ReduceHongBao reduceHongBao = new ReduceHongBao();
+ reduceHongBao.setLeft(goods.getLeftHongBaoCount());
+ reduceHongBao.setMoney(hongBao);
+ reduceHongBao.setName("浠樻绔嬪噺 ");
+ reduceHongBao.setTip("");
+ reduceHongBao.setTotal(goods.getTotalHongBaoCount());
+
+ OtherInfo otherInfo = new OtherInfo();
+ otherInfo.setReduceHongBao(reduceHongBao);
+
+ detailVO.setOtherInfo(otherInfo);
+ detailVO.setPictureTag(new ClientTextStyleVO("绔嬪噺TOP" + (i + 1), "#E5005C", "#FCE431", null));
+ detailVO.setRecommend(true);
+ array.add(0, gson.toJson(detailVO));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("list", array);
+ data.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+
+ // 浠庢帹鑽愭潵
+ if (page <= 1) {
+ array.clear();
+ if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
+ long startTime = java.lang.System.currentTimeMillis();
+
+ TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);
+
+ if (result != null && result.getTaoBaoGoodsBriefs() != null) {
+ // 绛涢��
+ List<GoodsDetailVO> goodsList = new ArrayList<>();
+
+ List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService
+ .filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());
+
+ // filter
+ try {
+ gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
+ } catch (Exception e) {
+ }
+
+ // 璁惧鎺ㄨ崘
+ if (gList != null) {
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+
+ 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);
+ detailVO.setRecommend(true);
+ goodsList.add(detailVO);
+ }
+ }
+ }
+
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
+ (int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Collections.shuffle(goodsList);
+ goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;
+ for (GoodsDetailVO goods : goodsList) {
+ array.add(gson.toJson(goods));
+ }
+ } else {
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
+ (int) (java.lang.System.currentTimeMillis() - startTime), "鏃犳帹鑽�"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ JSONArray localArray = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);
+ array.addAll(localArray);
+ } else {// 浠庣簿閫夊簱鏉�
+ array = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);
+ if (array == null) {
+ out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
+ return;
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("list", array);
+ data.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 浜笢棣栭〉鍟嗗搧
+ * @param acceptData
+ * @param page
+ * @param out
+ */
+ private void getIndexJDGoods(AcceptData acceptData, int page, PrintWriter out) {
+ JDSearchResult result = jdGoodsService.getIndexJDGoods(page);
+ long count = 0;
+ JSONObject data = new JSONObject();
+ JSONArray array = new JSONArray();
+ if (result != null) {
+ PageEntity pageEntity = result.getPageEntity();
+ if (pageEntity != null) {
+ count = pageEntity.getTotalCount();
+ }
+
+ List<JDGoods> goodsList = result.getGoodsList();
+ if (goodsList != null && goodsList.size() > 0) {
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ for (JDGoods goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ }
+ }
+
+ data.put("list", array);
+ data.put("count", count);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+ /**
+ * 鐖嗘鎺掕鍟嗗搧-瀹炴椂鐑攢姒�
+ * @param acceptData
+ * @param page
+ * @param out
+ */
+ private void getIndexPDDGoods(AcceptData acceptData, int page, PrintWriter out) {
+ PDDGoodsResult result = pddGoodsService.getIndexPDDGoods(page);
+ int count = 0;
+ JSONArray array = new JSONArray();
+ if (result != null) {
+ count = result.getTotalCount();
+ Gson gson = JsonUtil.getApiCommonGson();
+ List<PDDGoodsDetail> goodsList = result.getGoodsList();
+ if (goodsList != null && goodsList.size() > 0) {
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+
+ for (PDDGoodsDetail goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("list", array);
+ data.put("count", count);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
--
Gitblit v1.8.0