From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +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/JingDongControllerV2.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
index da405be..6e71c57 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.service.inter.jd.JDGoodsService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -54,25 +55,25 @@
@Resource
private DaTaoKeGoodsService daTaoKeGoodsService;
-
+
@Resource
private SwiperPictureService swiperPictureService;
-
+
@Resource
private QualityGoodsService qualityGoodsService;
-
+
@Resource
private ConfigService configService;
-
+
@Resource
private SpecialService specialService;
-
+
@Resource
private JDGoodsService jdGoodsService;
-
-
+
/**
* 浜笢涓撻鍒嗙被
+ *
* @param acceptData
* @param out
*/
@@ -83,10 +84,11 @@
root.put("jdLink", configService.get("jingdong_h5_link"));
out.print(JsonUtil.loadTrueResult(root));
}
-
-
+
+
/**
* 浜笢涓撻 + 鍟嗗搧鍒楄〃
+ *
* @param acceptData
* @param out
*/
@@ -99,14 +101,16 @@
topPicList = new ArrayList<SwiperPicture>();
}
root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));
+
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
- List<Special> listSpecial = specialService.listByPlaceKey("jingdong_special_index");
+ List<Special> listSpecial = specialService.listByPlaceKey("jingdong_special_index", platformCode, Integer.parseInt(acceptData.getVersion()));
if (listSpecial == null) {
listSpecial = new ArrayList<Special>();
}
root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));
}
-
+
try {
List<JDGoods> goodsList = jdGoodsService.specialSearch(page, cid);
JSONArray array = new JSONArray();
@@ -116,11 +120,11 @@
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, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
-
+
root.put("list", array);
root.put("count", 1000);
out.print(JsonUtil.loadTrueResult(root));
--
Gitblit v1.8.0