From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java | 86 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 34 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 47825f7..8cdb78c 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,19 +13,30 @@
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.clazz.GoodsClass;
+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;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
+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.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.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -61,6 +72,13 @@
@Resource
private ConfigService configService;
+ @Resource
+ private SpecialService specialService;
+
+ @Resource
+ private JDGoodsService jdGoodsService;
+
+
/**
* 浜笢涓撻鍒嗙被
* @param acceptData
@@ -68,15 +86,8 @@
*/
@RequestMapping(value = "getClass")
public void getJDClass(AcceptData acceptData, PrintWriter out) {
- List<GoodsClass> list = new ArrayList<GoodsClass>();
- list.add(new GoodsClass(1L, "绮鹃��"));
- list.add(new GoodsClass(2L, "濂宠"));
- list.add(new GoodsClass(3L, "鐢疯"));
- list.add(new GoodsClass(4L, "缇庡"));
- list.add(new GoodsClass(5L, "缇庨"));
- list.add(new GoodsClass(6L, "灞呭"));
JSONObject root = new JSONObject();
- root.put("list", list);
+ root.put("list", jdGoodsService.getSpecialClass());
root.put("jdLink", configService.get("jingdong_h5_link"));
out.print(JsonUtil.loadTrueResult(root));
}
@@ -88,41 +99,48 @@
* @param out
*/
@RequestMapping(value = "getGoodsInfo")
- public void getGoodsInfo(AcceptData acceptData, Integer cid, Integer page, PrintWriter out) {
+ public void getGoodsInfo(AcceptData acceptData, Long cid, Integer page, PrintWriter out) {
JSONObject root = new JSONObject();
if (cid == 1 && page == 1) {
- List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("jingdong_special_top");
+ List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("jingdong_special_index");
if (topPicList == null) {
topPicList = new ArrayList<SwiperPicture>();
}
root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));
- }
-
- List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * 20, 20);
- if (listQuery == null) {
- listQuery = new ArrayList<QualityFactory>();
- }
-
- JSONArray array = new JSONArray();
- if (listQuery.size() > 0) {
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- for (QualityFactory qualityFactory : listQuery) {
- TaoBaoGoodsBrief goods = qualityFactory.getTaoBaoGoodsBrief();
- if (goods == null) {
- continue;
- }
- array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate)));
+ List<Special> listSpecial = specialService.listByPlaceKey("jingdong_special_index");
+ if (listSpecial == null) {
+ listSpecial = new ArrayList<Special>();
}
+ root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));
}
- long count = qualityGoodsService.countFreeGoods();
- root.put("count", count);
- root.put("list", array);
- out.print(JsonUtil.loadTrueResult(root));
+
+ try {
+ JDSearchResult result = 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));
+ }
+ }
+ }
+
+ data.put("list", array);
+ data.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (JDGoodsException e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0