From c22963a2ee796e59094524cadc5a78c450ed98f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:54:29 +0800
Subject: [PATCH] 动态分享无券 + 下架 不能分享
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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..e994e79 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
@@ -70,19 +70,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 +102,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 +113,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 +189,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)));
}
}
}
@@ -228,7 +228,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