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

@@ -21,6 +21,7 @@
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

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

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

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

      // 格式验证

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

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

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

      // 格式验证

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

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

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

      // 格式验证

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

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

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



@@ -314,15 +315,15 @@
               .replace("{淘礼金面额}", BigDecimalUtil.getWithNoZera(spreadMoney).toString())

               .replace("{优惠券价}",

                     BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())

               .replace("{店铺类型}", goods.getUserType() == 1 ? "天猫价" : "淘宝价");

               .replace("{店铺类型}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO);

      }



      if (!hasCoupon) {

         return template.replace("{标题}", goods.getTitle())

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

               .replace("{月销量}", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{领券短链}", shortLink)

               .replace("{淘口令}", token).replace("{店铺类型}", goods.getUserType() == 1 ? "天猫价"

                     : "淘宝价");

               .replace("{淘口令}", token).replace("{店铺类型}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM

                     :  TaoBaoConstant.SHARE_PRICE_TAOBAO);

      } else {

         return template.replace("{标题}", goods.getTitle())

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

@@ -331,7 +332,7 @@
               .replace("{优惠券面额}", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())

               .replace("{优惠券价}",

                     BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())

               .replace("{店铺类型}", goods.getUserType() == 1 ? "天猫价" : "淘宝价");

               .replace("{店铺类型}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO);

      }

   }



@@ -352,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());

      }