From a1538bb24b06589c24092c6847a977da21e63c00 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 14:20:26 +0800
Subject: [PATCH] 返利与资金详情对应表

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
index e529895..dbf7e42 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -31,6 +31,7 @@
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.exception.HongBaoManageException;
 import com.yeshi.fanli.service.MaskKeyService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
@@ -178,6 +179,11 @@
 		if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
 			// 鍟嗗搧璇︽儏
 			// 鍙戠幇
+			// 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
+			if (text.length() > 50) {
+				out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
+				return;
+			}
 
 			SearchFilter sf = new SearchFilter();
 			sf.setKey(text);
@@ -385,10 +391,11 @@
 				return;
 			}
 			taoBaoGoodsBrief = taoBaoGoodsBriefs.get(0);
-			String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+			BigDecimal proportion = hongBaoManageService.getFanLiRate();
+			
 			BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
 			BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
-			BigDecimal tkp = new BigDecimal(proportion).divide(BigDecimal.valueOf(100))
+			BigDecimal tkp = proportion.divide(BigDecimal.valueOf(100))
 					.multiply(tkRate.divide(BigDecimal.valueOf(100)));
 			BigDecimal hongbao = MoneyBigDecimalUtil.mul(zkPrice, tkp);
 			dynamicRecommend.setHongbao(hongbao);

--
Gitblit v1.8.0