From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
index 6c10519..5a0364e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -20,13 +20,12 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import net.sf.json.JSONArray;
@@ -105,9 +104,17 @@
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
BigDecimal pro = hongBaoManageService.getFanLiRate();
+ if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
+ pro = new BigDecimal(100);
List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "")));
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "");
+ if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
+ {
+ extra.getTaoBaoHongBaoInfo().setRate("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
+ extra.getTaoBaoHongBaoInfo().setHongbao(TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
+ }
+ array.add(gson.toJson(extra));
}
root.put("goodsList", array);
root.put("goodsCount", result.getCount());
--
Gitblit v1.8.0