Merge remote-tracking branch 'origin/master'

Administrator

2018-12-10 d4c19062530c46203b0950b20e66afdeefcdf3a6

 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);