parent: bb54983b | 补丁 | 提交 | show whitespace
admin
2020-03-04 0444d8204d16a378a38ab29d2fe7b644fb68f0ca 
[口令]修改为[淘口令]
3个文件已修改
18 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java


@@ -1094,7 +1094,7 @@


                    TaoBaoGoodsBrief goods = taoBaoLink.getGoods();



                    if (!com.yeshi.fanli.util.VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(),



                            acceptData.getVersion()))



                        data.put("clickUrl", ShareControllerV2.getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), goods, taoBaoLink.getTaoToken()));



                        data.put("clickUrl", ShareControllerV2.getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), goods, taoBaoLink.getTaoToken()));







                    data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));







@@ -1119,7 +1119,7 @@


                        }



                    }



                    data.put("commentTexts", commentTexts);



                    data.put("wxErCode", ShareControllerV2.getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), goods, taoBaoLink.getTaoToken()));



                    data.put("wxErCode", ShareControllerV2.getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), goods, taoBaoLink.getTaoToken()));



                }







            } else if (cid == 4) { // 邀请分享





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


@@ -36,7 +36,6 @@


import com.yeshi.fanli.entity.bus.user.UserInfo;


import com.yeshi.fanli.entity.bus.user.UserInfoExtra;


import com.yeshi.fanli.entity.goods.CommonGoods;


import com.yeshi.fanli.entity.goods.ShareGoodsTextTemplate;


import com.yeshi.fanli.entity.jd.JDGoods;


import com.yeshi.fanli.entity.system.ConfigKeyEnum;


import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;


@@ -245,14 +244,11 @@


        }


    }




    public static String getERCodeContent(String template, TaoBaoGoodsBrief goods, String 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);


        commentText = commentText.replace("[淘口令]", token);


        if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) {


            commentText = commentText.replace("领券抢购", "抢购");


            commentText = commentText.replace("【券后价】[券后价]元", "");


@@ -560,7 +556,7 @@


                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()),


                shareInfo.setClickUrl(getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),


                        taoBaoLink.getGoods(), shareInfo.getToken()));


            }




@@ -568,7 +564,7 @@


                shareInfo.setWxErCode(getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),


                    taoBaoLink.getGoods(), shareInfo.getToken()));


            } else {


                shareInfo.setWxErCode(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),


                shareInfo.setWxErCode(getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),


                        taoBaoLink.getGoods(), shareInfo.getToken()));


            }


            




 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java


@@ -428,7 +428,7 @@


            if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {


                TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, "0");


                String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());


                commentText = template.replace("[口令]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));


                commentText = template.replace("[淘口令]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));


            } else if (goodsType == Constant.SOURCE_TYPE_JD) {


                String couponUrl = null;


                JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods);


@@ -1587,7 +1587,7 @@


                        


                        TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsVO.getGoodsId(), null);


                        String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());


                        String commentText = template.replace("[口令]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));


                        String commentText = template.replace("[淘口令]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));


                    


                        commentText = commentText.replace("[原价]", goodsVO.getZkPrice().toString());


                        if (!goodsVO.isHasCoupon()) {