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

admin

2019-11-29 32f8ab2806fb088335e24983477f5179064ada9d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java

@@ -617,7 +617,7 @@
         couponUrl = couponInfo.getLink();

      }

      String materialId = "https://item.jd.com/" + goodsId + ".html";

      String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid + "");

      String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid + "");



      ShareInfoVO shareInfo = new ShareInfoVO();

      shareInfo.setClickUrl(jumpLink);

@@ -1020,7 +1020,7 @@
         couponUrl = couponInfo.getLink();

      }

      String materialId = "https://item.jd.com/" + goodsId + ".html";

      String shortLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid + "");

      String shortLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid + "");



      String content = shareGoodsTextTemplateService.createContentByTemplateJD(template, uid, goods, shortLink,

            hasCoupon);