admin
2020-02-29 88e78422b773a1a22b7c8f8b6dabdd293f5321d2
Merge remote-tracking branch 'origin/div' into div
2个文件已修改
8 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -615,7 +615,7 @@
                if (StringUtil.isNullOrEmpty(goods.getDescription())) {
                    recommendText = recommendText.replace("推荐理由:[推荐语]", "");
                } else {
                    recommendText = recommendText.replace("[推荐理由]", goods.getDescription());
                    recommendText = recommendText.replace("[推荐语]", goods.getDescription());
                }
                
                String sales = TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day());
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -416,7 +416,7 @@
        if (addComment) {
            String commentText = "";
            if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
                TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(0L, goodsId, null);
                TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, null);
                String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
                commentText = template.replace("[口令]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
            } else if (goodsType == Constant.SOURCE_TYPE_JD) {
@@ -426,11 +426,11 @@
                    couponUrl = couponInfo.getLink();
                }
                String materialId = "https://item.jd.com/" + goodsId + ".html";
                String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "","0");
                String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "","1");
                String template = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey());
                commentText = template.replace("[链接]", jumpLink);            
            } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
                String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", "0");
                String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", "1");
                String template = configService.get(ConfigKeyEnum.quickSharePDDCommentText.getKey());
                commentText = template.replace("[链接]", jumpLink);
            }