From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 42 ++++++++++++++----------------------------
1 files changed, 14 insertions(+), 28 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 2265263..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,8 +16,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dto.jd.JDFilter;
-import com.yeshi.fanli.dto.jd.JDSearchFilter;
import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
@@ -38,9 +36,11 @@
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;
@@ -50,9 +50,6 @@
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.jd.JDApiUtil;
-import com.yeshi.fanli.util.jd.JDUtil;
-import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -106,6 +103,12 @@
@Resource
private SwiperPictureService swiperPictureService;
+ @Resource
+ private JDGoodsService jdGoodsService;
+
+ @Resource
+ private PDDGoodsService pddGoodsService;
+
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.5.3)
@@ -313,7 +316,7 @@
}
if (goodsType == Constant.SOURCE_TYPE_PDD) {
- searchPDDGoods(acceptData, page, out);
+ getIndexPDDGoods(acceptData, page, out);
return;
}
out.print(JsonUtil.loadFalseResult("鍟嗗搧绫诲瀷閿欒"));
@@ -475,21 +478,7 @@
* @param out
*/
private void getIndexJDGoods(AcceptData acceptData, int page, PrintWriter out) {
- JDSearchResult result = null;
- String way = configService.get("jd_api_search_key");
- if ("1".equals(way)) {
- JDFilter filterAPI = new JDFilter();
- filterAPI.setPageIndex(page);
- filterAPI.setPageSize(20);
- result = JDApiUtil.queryByKey(filterAPI);
- } else {
- // 缃戦〉鐖彇
- JDSearchFilter jdfilter = new JDSearchFilter();
- jdfilter.setPageNo(page);
- jdfilter.setPageSize(Constant.PAGE_SIZE);
- result = JDUtil.searchByKey(jdfilter);
- }
-
+ JDSearchResult result = jdGoodsService.getIndexJDGoods(page);
long count = 0;
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
@@ -506,8 +495,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -525,9 +513,8 @@
* @param page
* @param out
*/
- private void searchPDDGoods(AcceptData acceptData, int page, PrintWriter out) {
- PDDGoodsResult result = PinDuoDuoApiUtil.getTopList(PinDuoDuoApiUtil.PID_FANLI, page-1, Constant.PAGE_SIZE, 1);
-
+ private void getIndexPDDGoods(AcceptData acceptData, int page, PrintWriter out) {
+ PDDGoodsResult result = pddGoodsService.getIndexPDDGoods(page);
int count = 0;
JSONArray array = new JSONArray();
if (result != null) {
@@ -539,8 +526,7 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
for (PDDGoodsDetail goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
--
Gitblit v1.8.0