From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 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 5a84757..8bc6b7a 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
@@ -15,6 +15,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.common.CommonContentNav;
import com.yeshi.fanli.dto.common.CommonContentResult;
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
@@ -36,6 +37,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -145,7 +147,7 @@
// 鐚滀綘鍠滄
String idfa = acceptData.getIdfa();
String imei = acceptData.getImei();
- result = guessLikeDeviceTB(idfa, imei, page);
+ result = guessLikeDeviceTB(idfa, imei, acceptData.getUtdid(), page);
} else {
// 澶ф窐瀹㈤〉鐮佸彧鑳戒负10,50,100,200
result = commonTemplateContentService.getContentList(type, cid, page, 10);
@@ -160,22 +162,25 @@
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
- List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ if (result != null)
+ goodsList = result.getGoodsList();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
- GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+ GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
if (type == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
{
vo.getMoneyInfo().setFanliMoney("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
vo.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
+ vo.getMoneyInfo().setMaxMoney(null);
}
array.add(gson.toJson(vo));
}
root.put("list", array);
- root.put("count", result.getCount());
+ root.put("count", result != null ? result.getCount() : 0);
out.print(JsonUtil.loadTrueResult(root));
}
@@ -208,12 +213,13 @@
List<JDGoods> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
for (JDGoods goods : goodsList) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO)));
}
}
}
@@ -238,7 +244,8 @@
// 2銆侀《閮ㄨ疆鎾浘
List<SwiperPicture> bannerList = null;
if (Constant.IS_TEST) {
- bannerList = swiperPictureService.getByBannerCard("index_top");
+ bannerList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
}
if (bannerList == null) {
@@ -257,12 +264,13 @@
List<PDDGoodsDetail> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
for (PDDGoodsDetail goods : goodsList) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO)));
}
}
}
@@ -280,8 +288,8 @@
* @return
*/
@Cacheable(value = "commonContentCache", key = "#idfa+'-'+#imei+'-'+#page")
- private CommonContentResult guessLikeDeviceTB(String idfa, String imei, Integer page) {
- TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa);
+ private CommonContentResult guessLikeDeviceTB(String idfa, String imei, String utdid, Integer page) {
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa, utdid);
if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
&& searchResult.getTaoBaoGoodsBriefs().size() > 0) {
CommonContentResult result = new CommonContentResult();
--
Gitblit v1.8.0