Merge remote-tracking branch 'origin/div' into div

admin

2020-02-28 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0

 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("推荐语:[推荐语]", "");
               recommendText = recommendText.replace("推荐理由:[推荐语]", "");
            } else {
               recommendText = recommendText.replace("[推荐语]", goods.getDescription());
               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());
@@ -625,7 +631,7 @@
            if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
               commentText = commentText.replace("领券抢购", "抢购");
               commentText = commentText.replace("【券后价】[券后价]元", "");
               recommendText = recommendText.replace("优惠券:[券面额]", "");
               recommendText = recommendText.replace("优惠券:[券面额]元", "");
            } else {
               commentText = commentText.replace("[券后价]",
                     TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
@@ -787,18 +793,24 @@
      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("推荐语:[推荐语]", "");
         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);
         if (couponInfo == null) {
            commentText = commentText.replace("领券抢购", "抢购");
            commentText = commentText.replace("【券后价】[券后价]元", "");
            recommendText = recommendText.replace("优惠券:[券面额]", "");
            recommendText = recommendText.replace("优惠券:[券面额]元", "");
         } else {
            commentText = commentText.replace("[券后价]",
                  BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(jdGoods)).toString());
@@ -968,8 +980,13 @@
         if (StringUtil.isNullOrEmpty(salesTip)) {
            salesTip = "0";
         }
         recommendText = recommendText.replace("[销量]", salesTip);
         recommendText = recommendText.replace("推荐语:[推荐语]", "");
         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());
         commentText = quickCommentText.replace("[原价]", MoneyBigDecimalUtil
@@ -978,7 +995,7 @@
         if (!hasCoupon) {
            commentText = commentText.replace("领券抢购", "抢购");
            commentText = commentText.replace("【券后价】[券后价]元", "");
            recommendText = recommendText.replace("优惠券:[券面额]", "");
            recommendText = recommendText.replace("优惠券:[券面额]元", "");
         } else {
            commentText = commentText.replace("[券后价]",
                  BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getQuanPrice(goods)).toString());