Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -96,7 +96,7 @@
            if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())

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

               count++;

               goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);

               goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();

               int totalHongBaoCount = 2000 + (int) (Math.random() * 8000);

               int leftHongBaoCount = 200 + (int) (Math.random() * 2000);

               tljBuyGoodsService.addTLJBuyGoods(