admin
2020-02-28 4b158de47e9231c17c661617115c746cdd1445d9
Merge remote-tracking branch 'origin/div' into div
2个文件已修改
37 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -611,12 +611,18 @@
            if (VersionUtil.greaterThan_2_0_7(platform, version)) {
                TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
                String template = configService.get(ConfigKeyEnum.quickShareGoodsText.getKey());
                recommendText = template.replace("[商品标题]", goods.getTitle()).replace("[销量]",
                        TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()));
                recommendText = template.replace("[商品标题]", goods.getTitle());
                if (StringUtil.isNullOrEmpty(goods.getDescription())) {
                    recommendText = recommendText.replace("推荐理由:[推荐语]", "");
                } else {
                    recommendText = recommendText.replace("[推荐理由]", goods.getDescription());
                }
                String sales = TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day());
                if (sales.equals("0")) {
                    recommendText = recommendText.replace("销量:[销量]", "");
                } else {
                    recommendText = recommendText.replace("[销量]", sales.replace("万", "w"));
                }
                String quickCommentText = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
@@ -787,11 +793,17 @@
        String recommendText = "";
        if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
            String template = configService.get(ConfigKeyEnum.quickShareGoodsText.getKey());
            recommendText = template.replace("[商品标题]", jdGoods.getSkuName()).replace("[销量]",
                    JDUtil.getSaleCount(jdGoods.getInOrderCount30Days()));
            recommendText = template.replace("[商品标题]", jdGoods.getSkuName());
            // 无推荐语
            recommendText = recommendText.replace("推荐理由:[推荐语]", "");
            String sales = JDUtil.getSaleCount(jdGoods.getInOrderCount30Days());
            if (sales.equals("0")) {
                recommendText = recommendText.replace("销量:[销量]", "");
            } else {
                recommendText = recommendText.replace("[销量]", sales.replace("万", "w"));
            }
            String quickCommentText = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey());
            commentText = quickCommentText.replace("[原价]", jdGoods.getPrice().toString());
            commentText = commentText.replace("[链接]", jumpLink);
@@ -968,7 +980,12 @@
            if (StringUtil.isNullOrEmpty(salesTip)) {
                salesTip = "0";
            }
            recommendText = recommendText.replace("[销量]", salesTip);
            if (salesTip.equals("0")) {
                recommendText = recommendText.replace("销量:[销量]", "");
            } else {
                recommendText = recommendText.replace("[销量]", salesTip.replace("万", "w"));
                recommendText = recommendText.replace("销量", "总销量");
            }
            recommendText = recommendText.replace("推荐理由:[推荐语]", "");
            String quickCommentText = configService.get(ConfigKeyEnum.quickSharePDDCommentText.getKey());
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -438,7 +438,10 @@
            commentText = commentText.replace("[原价]", goodsDetailVO.getZkPrice().toString());
            if (!goodsDetailVO.isHasCoupon()) {
                commentText = commentText.replace("领券抢购", "抢购");
            }
                commentText = commentText.replace("【券后价】[券后价]元", "");
            } else {
                commentText = commentText.replace("[券后价]", goodsDetailVO.getCouponPrice().toString());
            }
            
            CommentInfo commentInfo = new CommentInfo();
            commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -1418,7 +1421,10 @@
                    commentText = commentText.replace("[原价]", goodsVO.getZkPrice().toString());
                    if (!goodsVO.isHasCoupon()) {
                        commentText = commentText.replace("领券抢购", "抢购");
                    }
                        commentText = commentText.replace("【券后价】[券后价]元", "");
                    } else {
                        commentText = commentText.replace("[券后价]", goodsVO.getCouponPrice().toString());
                    }
                    
                    CommentInfo commentInfo = new CommentInfo();
                    commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));