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 | 83 +++++++++++++++--------------------------
1 files changed, 31 insertions(+), 52 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 6426b3c..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
@@ -1,7 +1,6 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -12,21 +11,23 @@
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+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.entity.bus.lable.QualityFactory;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+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;
@@ -42,7 +43,7 @@
public class PinDuoDuoControllerV2 {
@Resource
- private HongBaoManageService hongBaoManageService;
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@@ -62,6 +63,9 @@
@Resource
private SpecialService specialService;
+ @Resource
+ private PDDGoodsService pddGoodsService;
+
/**
@@ -71,27 +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, "濂宠"));
- list.add(new GoodsClass(7L, "鐢靛櫒"));
- list.add(new GoodsClass(8L, "闉嬪寘"));
- list.add(new GoodsClass(9L, "鍐呰。"));
- list.add(new GoodsClass(10L, "缇庡"));
- list.add(new GoodsClass(11L, "鐢疯"));
- list.add(new GoodsClass(12L, "姹借溅"));
- list.add(new GoodsClass(13L, "姘存灉"));
- list.add(new GoodsClass(14L, "瀹跺眳"));
- list.add(new GoodsClass(15L, "鏂囧叿"));
- list.add(new GoodsClass(16L, "杩愬姩"));
- list.add(new GoodsClass(17L, "铏氭嫙"));
- list.add(new GoodsClass(18L, "鍖昏嵂"));
JSONObject root = new JSONObject();
- root.put("list", list);
+ root.put("list", pddGoodsService.getSpecialClass());
out.print(JsonUtil.loadTrueResult(root));
}
@@ -102,47 +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("pinduoduo_special_index");
+ 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));
-
- List<Special> listSpecial = specialService.listByPlaceKey("pinduoduo_special_index");
+ 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));
}
- List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * 20, 20);
- if (listQuery == null) {
- listQuery = new ArrayList<QualityFactory>();
- }
+ 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());
- 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;
+ for (PDDGoodsDetail goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
+ array.add(gson.toJson(goodsDetailVO));
}
- array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate)));
}
+ root.put("list", array);
+ root.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(root));
+ } catch (PDDOrderException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
}
- long count = qualityGoodsService.countFreeGoods();
-
- root.put("count", count);
- root.put("list", array);
- out.print(JsonUtil.loadTrueResult(root));
}
}
--
Gitblit v1.8.0