Merge remote-tracking branch 'origin/master'

Administrator

2018-12-10 d4c19062530c46203b0950b20e66afdeefcdf3a6

 fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java

@@ -23,6 +23,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.goods.RecommendDetailsService;

import com.yeshi.fanli.service.inter.goods.RecommendReplyService;

@@ -295,10 +296,10 @@
            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);