From e5e38de6745c8fcae91fa7e459898f3663d00001 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:41:32 +0800
Subject: [PATCH] 通用模板修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index 24d6b30..302b704 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;
import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
@@ -48,7 +49,9 @@
@RequestMapping("api/v2/commoncontent")
public class CommonContentControllerV2 {
-
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
@Resource
private HongBaoManageService hongBaoManageService;
@@ -70,19 +73,19 @@
* @param out
*/
@RequestMapping(value = "getNavList", method = RequestMethod.POST)
- public void getNavList(AcceptData acceptData, String key, Integer goodsType, PrintWriter out) {
+ public void getNavList(AcceptData acceptData, String key, Integer type, PrintWriter out) {
if (StringUtil.isNullOrEmpty(key)) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
return;
}
List<CommonContentNav> list = null;
- if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (type == null || type == Constant.SOURCE_TYPE_TAOBAO) {
list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
- } else if (goodsType == Constant.SOURCE_TYPE_JD) {
+ } else if (type == Constant.SOURCE_TYPE_JD) {
// 鏆傛棤鍒嗙被
- } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- // 鏆傛棤鍒嗙被
+ } else if (type == Constant.SOURCE_TYPE_PDD) {
+ list = pddCommonTemplateContentService.getNavList(PDDCommonContentTypeEnum.valueOf(key));
}
if (list == null) {
@@ -102,7 +105,7 @@
* @param out
*/
@RequestMapping(value = "getNavGoodsList", method = RequestMethod.POST)
- public void getNavContent(AcceptData acceptData, String key, Integer goodsType, Integer page, String cid, PrintWriter out) {
+ public void getNavContent(AcceptData acceptData, String key, Integer type, Integer page, String cid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(key)) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
return;
@@ -113,17 +116,17 @@
return;
}
- if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (type == null || type == Constant.SOURCE_TYPE_TAOBAO) {
getListTB(acceptData, key, page, cid, out);
return;
}
- if (goodsType == Constant.SOURCE_TYPE_JD) {
+ if (type == Constant.SOURCE_TYPE_JD) {
getListJD(acceptData, key, page, cid, out);
return;
}
- if (goodsType == Constant.SOURCE_TYPE_PDD) {
+ if (type == Constant.SOURCE_TYPE_PDD) {
getListPDD(acceptData, key, page, cid, out);
return;
}
@@ -189,7 +192,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate)));
}
}
}
@@ -211,7 +214,16 @@
public void getListPDD(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
JSONObject data = new JSONObject();
if (page == 1) {
- List<SwiperPicture> bannerList = new ArrayList<>();
+ // 2銆侀《閮ㄨ疆鎾浘
+ List<SwiperPicture> bannerList = null;
+ if (Constant.IS_TEST) {
+ bannerList = swiperPictureService.getByBannerCard("index_top");
+ }
+
+ if (bannerList == null) {
+ bannerList = new ArrayList<SwiperPicture>();
+ }
+
data.put("bannerList", new Gson().toJson(bannerList));
}
@@ -228,7 +240,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (PDDGoodsDetail goods : goodsList) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate)));
}
}
}
--
Gitblit v1.8.0