Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-26 588607eeb4168f6f5734fdc91bb3dfd101eeb4eb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -2185,6 +2185,8 @@
      // 红包

      if (hongBao == null) {

         BigDecimal proportion = manageService.getFanLiRate();

         if ("taolijin".equalsIgnoreCase(from))

            proportion = manageService.getTLJShareRate(System.currentTimeMillis());

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goodsJson.put("hongBao", hongBao);