admin
2020-03-01 b730b81641e9eadac879a401aedbd333e6973e28
Merge remote-tracking branch 'origin/div' into div
1个文件已修改
20 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -245,7 +245,11 @@
    }
    public static String getERCodeContent(String template, TaoBaoGoodsBrief goods, String token) {
        // return template.replace("[淘口令]", token);
         return template.replace("[淘口令]", token);
    }
    public static String getERCodeContentNew(String template, TaoBaoGoodsBrief goods, String token) {
        String commentText = template.replace("[原价]", goods.getZkPrice().toString());
        commentText = commentText.replace("[口令]", token);
        if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) {
@@ -565,14 +569,26 @@
                descText = descText.substring(0);
            }
            shareInfo.setDescText(descText);
            // 测试
            // 2.0.2之前
            if (!VersionUtil.greaterThan_2_0_2(platform, version))
            if (VersionUtil.greaterThan_2_0_7(platform, version)) {
                shareInfo.setClickUrl(getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
                        taoBaoLink.getGoods(), shareInfo.getToken()));
            } else if (!VersionUtil.greaterThan_2_0_2(platform, version)) {
                shareInfo.setClickUrl(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
                        taoBaoLink.getGoods(), shareInfo.getToken()));
            }
            if (VersionUtil.greaterThan_2_0_7(platform, version)) {
                shareInfo.setWxErCode(getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
                    taoBaoLink.getGoods(), shareInfo.getToken()));
            } else {
            shareInfo.setWxErCode(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
                    taoBaoLink.getGoods(), shareInfo.getToken()));
            }
            // 提示图文内容
            String imgs = configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), platform,