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/PinDuoDuoControllerV2.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java
index ab3535f..5c462c1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -10,15 +11,24 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
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.exception.pdd.PDDOrderException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
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.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
+import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
/**
@@ -45,6 +55,16 @@
@Resource
private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private QualityGoodsService qualityGoodsService;
+
+ @Resource
+ private SpecialService specialService;
+
+ @Resource
+ private PDDGoodsService pddGoodsService;
+
/**
@@ -54,15 +74,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", pddGoodsService.getSpecialClass());
out.print(JsonUtil.loadTrueResult(root));
}
@@ -73,20 +86,40 @@
* @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("pdd_top");
+ List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("pinduoduo_special_index");
if (topPicList == null) {
topPicList = new ArrayList<SwiperPicture>();
}
root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));
+
+ List<Special> listSpecial = specialService.listByPlaceKey("pinduoduo_special_index");
+ if (listSpecial == null) {
+ listSpecial = new ArrayList<Special>();
+ }
+ root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));
}
- // TODO
-
-
- out.print(JsonUtil.loadTrueResult(root));
+ try {
+ List<PDDGoodsDetail> goodsList = pddGoodsService.specialSearch(page, cid);
+ JSONArray array = new JSONArray();
+ if (goodsList != null && goodsList.size() > 0) {
+ Gson gson = JsonUtil.getApiCommonGson();
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ for (PDDGoodsDetail goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ }
+ root.put("list", array);
+ root.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(root));
+ } catch (PDDOrderException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ }
}
}
--
Gitblit v1.8.0