From 9b55262bb45c81c997ab04e55e8de13e14b8ca7d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 15:11:37 +0800
Subject: [PATCH] 商品最高返
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 36f71ea..bde152b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -23,6 +23,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.douyin.DouYinGoods;
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDSearchFilter;
@@ -350,7 +351,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
data.put("type", type);
data.put("goods",
- gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
+ gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -463,7 +464,7 @@
JSONObject data = new JSONObject();
data.put("type", 3);
data.put("goods", gson
- .toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, null, fanLiRate, shareRate)));
+ .toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
out.print(JsonUtil.loadTrueResult(data));
return true;
}
@@ -735,8 +736,10 @@
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
- list.add(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate));
+ list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
}
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -927,8 +930,10 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
if (goodsDetailVO.isHasCoupon()) {
array.add(gson.toJson(goodsDetailVO));
@@ -1009,9 +1014,10 @@
if (goodsList != null && goodsList.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
for (PDDGoodsDetail goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
array.add(gson.toJson(goodsDetailVO));
}
}
--
Gitblit v1.8.0