动态v2兼容

yujian

2019-07-31 f4548a3ee46afe45da4ee2a42dc169c575deee9f

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

@@ -71,6 +71,7 @@
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;

@@ -538,25 +539,28 @@
         return;

      }



      String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePathJD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

            goodsId + "");

//      String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

//            Constant.systemCommonConfig.getShareGoodsPagePathJD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

//            goodsId + "");



      // 券短连接

      String shortLink = HttpUtil.getShortLink(url);

      if (!StringUtil.isNullOrEmpty(shortLink)) {

         url = shortLink;

      String couponUrl = null;

      JDCouponInfo couponInfo = jdGoods.getCouponInfo();

      if (couponInfo != null) {

         couponUrl = couponInfo.getLink();

      }

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

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

		


      ShareInfoVO shareInfo = new ShareInfoVO();

      shareInfo.setClickUrl(url);

      shareInfo.setClickUrl(jumpLink);

      shareInfo.setRule(configService.get("share_rule_link_jd"));

      shareInfo.setPictUrl(jdGoods.getPicUrl());

      

      String shareText = "";

      boolean hasCoupon = false;

		
      // 分享模板

      JDCouponInfo couponInfo = jdGoods.getCouponInfo();

      ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);

      if (couponInfo == null) { // 无券模板

         if (textTemplate != null) 

@@ -572,7 +576,7 @@
         if (StringUtil.isNullOrEmpty(shareText))

            shareText = configService.get("goods_share_text_coupon_jd");

      }

      shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, shortLink, hasCoupon);

      shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, jumpLink, hasCoupon);

      shareInfo.setShareText(shareText);



      String descText = shareText.replace(jdGoods.getSkuName(), "").trim();

@@ -649,17 +653,14 @@
         return;

      }



      String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePathPDD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

            goodsId + "");

//      String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

//            Constant.systemCommonConfig.getShareGoodsPagePathPDD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

//            goodsId + "");



      String shortLink = HttpUtil.getShortLink(url);

      if (!StringUtil.isNullOrEmpty(shortLink)) {

         url = shortLink;

      }

      String jumpLink = PinDuoDuoApiUtil.convert(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", uid + "");

      

      ShareInfoVO shareInfo = new ShareInfoVO();

      shareInfo.setClickUrl(url);

      shareInfo.setClickUrl(jumpLink);

      shareInfo.setRule(configService.get("share_rule_link_pdd"));

      shareInfo.setPictUrl(goods.getGoodsImageUrl());



@@ -685,7 +686,7 @@
      String token = PinDuoDuoApiUtil.createGenerate(goodsId);

            

      // 生成分享内容

      String shareText = shareGoodsTextTemplateService.createContentByTemplatePDD(template, uid, goods, shortLink,

      String shareText = shareGoodsTextTemplateService.createContentByTemplatePDD(template, uid, goods, jumpLink,

                  hasCoupon, token);

      shareInfo.setShareText(shareText);