From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java
index b19324b..63d9722 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java
@@ -63,7 +63,8 @@
 	 * @param goods
 	 * @return
 	 */
-	public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods,String token,String shortLink, boolean hasCoupon);
+	public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods,String token,
+			String shortLink, boolean hasCoupon, String from);
 
 	/**
 	 * 杩樺師鏅�氭ā鏉�
@@ -78,4 +79,32 @@
 	 * @param uid
 	 */
 	public void resetCouponTemplate(Long uid);
+
+	/**
+	 * 娣樼ぜ閲戞ā鏉挎槸鍚︽纭�
+	 * @param template
+	 * @throws ShareGoodsTextTemplateException
+	 */
+	public void isTaoLiJinTemplateRight(String template) throws ShareGoodsTextTemplateException;
+
+	/**
+	 * 淇濆瓨娣樼ぜ閲戞ā鏉�
+	 * @param uid
+	 * @param template
+	 * @throws ShareGoodsTextTemplateException
+	 */
+	public void saveTaoLiJinTemplate(Long uid, String template) throws ShareGoodsTextTemplateException;
+
+	/**
+	 * 杩樺師娣樼ぜ閲戞ā鏉�
+	 * @param uid
+	 */
+	public void resetTaoLijinTemplate(Long uid);
+
+	/**
+	 * 娣樼ぜ閲戞ā鏉�
+	 * @param uid
+	 * @return
+	 */
+	public String getTaoLiJinTemplate(Long uid);
 }

--
Gitblit v1.8.0