Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

 fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java

@@ -89,8 +89,7 @@
         if (goods != null && goods.getCouponAmount() != null

               && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {



            if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())

                  .compareTo(new BigDecimal("734")) >= 0) {

            if (TaoBaoUtil.canAddToTLJBuyGoods(goods)) {

               count++;

               goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);

               shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));