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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java

@@ -110,7 +110,7 @@
      return null;

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void saveCouponTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {

      // 格式验证

@@ -132,7 +132,7 @@
      }

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void saveCouponTemplateJD(Long uid, String template) throws ShareGoodsTextTemplateException {

      // 格式验证

@@ -154,7 +154,7 @@
      }

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void saveCouponTemplatePDD(Long uid, String template) throws ShareGoodsTextTemplateException {

      // 格式验证

@@ -176,7 +176,7 @@
      }

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void saveTaoLiJinTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {



@@ -353,7 +353,7 @@
         template = template.replace("{标题}", goods.getSkuName())

               .replace("{商品原价}", BigDecimalUtil.getWithNoZera(price).toString())

               .replace("{月销量}", JDUtil.getSaleCount(goods.getInOrderCount30Days())).replace("{短链接}", shortLink)

               .replace("{优惠券面额}", BigDecimalUtil.getWithNoZera(goods.getCouponInfo().getDiscount()).toString())

               .replace("{优惠券面额}", BigDecimalUtil.getWithNoZera(JDUtil.getShowCouponInfo( goods).getDiscount()).toString())

               .replace("{优惠券价}", BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(goods)).toString());

      }