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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -213,7 +213,7 @@
      data.put("quanPrice", afterCouponPrice);

      data.put("zkPrice", goods.getZkPrice());

      data.put("shareContent", "长按复制本段文字，打开【手机淘宝】即可领取【特别优惠券】购买下单，");

      data.put("token", link.getTaoToken());

      data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken()));

      data.put("reservePrice", goods.getReservePrice());

      data.put("shopType", goods.getUserType() == 1 ? 2 : 1);

      if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) {

@@ -375,7 +375,7 @@
      data.put("quanPrice", afterCouponPrice);

      data.put("zkPrice", goods.getZkPrice());

      data.put("shareContent", "长按复制本段文字，打开【手机淘宝】即可领取【特别优惠券】购买下单，");

      data.put("token", link.getTaoToken());

      data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken()));

      data.put("reservePrice", goods.getReservePrice());

      data.put("shopType", goods.getUserType() == 1 ? 2 : 1);

      if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) {