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

yujian

2020-05-23 dd6a31aae79b35ccf0e006704a4d9e1d950c57d6

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.inter.goods;



import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;

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

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

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

@@ -209,12 +210,16 @@
   

   public String createContentPDD(String template, PDDGoodsDetail goods, String jumpLink, boolean coupon);



   public String createContentVIP(String template, VIPGoodsInfo goods, String jumpLink);



   public String getTextTemplateByJD(Long uid);



   public String getTextTemplateByTB(Long uid);



   public String getTextTemplateByPDD(Long uid);



   public String getTextTemplateByVIP(Long uid);



   public void saveTemplateTB(Long uid, String template) throws ShareGoodsTextTemplateException;



   public void saveTemplateJD(Long uid, String template) throws ShareGoodsTextTemplateException;