From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +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 | 68 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 40 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 8cdb78c..1ef91ab 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
@@ -13,15 +13,10 @@
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.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.lable.QualityFactory;
import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.jd.JDGoodsException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -32,10 +27,8 @@
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.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
-import com.yeshi.fanli.util.taobao.SearchFilterUtil;
+import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
@@ -62,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
*/
@@ -91,10 +84,11 @@
root.put("jdLink", configService.get("jingdong_h5_link"));
out.print(JsonUtil.loadTrueResult(root));
}
-
-
+
+
/**
- * 浜笢涓撻
+ * 浜笢涓撻 + 鍟嗗搧鍒楄〃
+ *
* @param acceptData
* @param out
*/
@@ -107,39 +101,33 @@
topPicList = new ArrayList<SwiperPicture>();
}
root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));
-
+
List<Special> listSpecial = specialService.listByPlaceKey("jingdong_special_index");
if (listSpecial == null) {
listSpecial = new ArrayList<Special>();
}
root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));
}
-
-
+
try {
- JDSearchResult result = jdGoodsService.specialSearch(page, cid);
+ List<JDGoods> goodsList = jdGoodsService.specialSearch(page, cid);
JSONArray array = new JSONArray();
- JSONObject data = new JSONObject();
- if (result != null) {
- 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, null, fanLiRate,
- shareRate);
- array.add(gson.toJson(goodsDetailVO));
- }
+ 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", 1000);
- out.print(JsonUtil.loadTrueResult(data));
+
+ root.put("list", array);
+ root.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(root));
} catch (JDGoodsException e) {
- e.printStackTrace();
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
}
}
--
Gitblit v1.8.0