From 27920d99bc5925de113aa4f0c22dbba3dcea672f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:46:58 +0800
Subject: [PATCH] 增加通用模板免单内容

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..0878955 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
@@ -24,9 +24,7 @@
 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,6 +103,8 @@
 		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(), "")));

--
Gitblit v1.8.0