From 20d26681f7466f2ff03131aabd98dcf1f146cd9a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 15:03:32 +0800
Subject: [PATCH] test1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..e874647 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
@@ -39,15 +39,12 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.DynamicRecommendService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/dynamic")
@@ -178,6 +175,11 @@
if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
// 鍟嗗搧璇︽儏
// 鍙戠幇
+ // 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
+ if (text.length() > 50) {
+ out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
+ return;
+ }
SearchFilter sf = new SearchFilter();
sf.setKey(text);
@@ -385,10 +387,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