From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 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..ff79759 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
@@ -10,15 +10,26 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+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.order.OrderHongBaoMoneyComputeService;
+import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
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;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
/**
@@ -32,7 +43,7 @@
public class PinDuoDuoControllerV2 {
@Resource
- private HongBaoManageService hongBaoManageService;
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@@ -45,6 +56,16 @@
@Resource
private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private QualityGoodsService qualityGoodsService;
+
+ @Resource
+ private SpecialService specialService;
+
+ @Resource
+ private PDDGoodsService pddGoodsService;
+
/**
@@ -54,15 +75,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 +87,41 @@
* @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.getByBannerCardAndVersion("pinduoduo_special_index",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (topPicList == null) {
topPicList = new ArrayList<SwiperPicture>();
}
root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ List<Special> listSpecial = specialService.listByPlaceKey("pinduoduo_special_index", platformCode, Integer.parseInt(acceptData.getVersion()));
+ 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();
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
+ for (PDDGoodsDetail goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
+ 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