From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 f01d507..6e61b52 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
@@ -40,6 +40,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -148,7 +149,7 @@
result = guessLikeDeviceTB(idfa, imei, acceptData.getUtdid(), page);
} else {
// 澶ф窐瀹㈤〉鐮佸彧鑳戒负10,50,100,200
- result = commonTemplateContentService.getContentList(type, cid, page, 10);
+ result = commonTemplateContentService.getContentList(type, cid, page, 10,acceptData.getSystem());
}
JSONObject root = new JSONObject();
@@ -165,7 +166,7 @@
goodsList = result.getGoodsList();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
if (type == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
@@ -214,7 +215,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (JDGoods goods : goodsList) {
array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO)));
@@ -240,14 +241,14 @@
JSONObject data = new JSONObject();
if (page == 1) {
// 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> bannerList = null;
+ List<BannerVO> bannerList = null;
if (Constant.IS_TEST) {
bannerList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
}
if (bannerList == null) {
- bannerList = new ArrayList<SwiperPicture>();
+ bannerList = new ArrayList<BannerVO>();
}
data.put("bannerList", new Gson().toJson(bannerList));
@@ -265,7 +266,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (PDDGoodsDetail goods : goodsList) {
array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO)));
--
Gitblit v1.8.0