From 1261c227e7ad47607ee651bbd017ea80eb6d044a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 14 十二月 2019 18:45:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java
index b72c819..86a671e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java
@@ -1,6 +1,9 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.util.Date;
 import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
 public interface SpreadUserImgService {
 
@@ -18,7 +21,14 @@
 	 * @param uid
 	 * @return
 	 */
-	List<String> getUserSpreadImg(Long uid);
+	List<String> getUserSpreadImg(Long uid, HttpServletRequest request);
+
+	/**
+	 * 鐢ㄦ埛鍒嗕韩鍥剧殑鏁伴噺
+	 * @param uid
+	 * @return
+	 */
+	int countUserSpreadImg(Long uid);
 
 	/**
 	 * 鑾峰彇浠ユ煇寮犲浘鐗囦负鑳屾櫙鐨勯個璇峰垎浜浘
@@ -42,4 +52,28 @@
 	 */
 	String getUserSpreadImg(Long uid, String bgImg, int erCodePostionX, int erCodePostionY, int erCodeSize);
 
+	/**
+	 *  鏍规嵁鍥剧墖鐢讳簩缁寸爜
+	 * @param uid
+	 * @param bgImg
+	 * @param inviteCode
+	 * @return
+	 * @throws Exception
+	 */
+	String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, Integer pX, Integer pY, Integer size, String inviteCode) throws Exception;
+
+	/**
+	 * 閭�璇峰浘鐗� 闂��
+	 * @param bgImg
+	 * @param uid
+	 * @param portrait
+	 * @param inviteCode
+	 * @param content
+	 * @param date
+	 * @return
+	 * @throws Exception
+	 */
+	public String getInviteImgToGreet(String bgImg, Long uid, String portrait, String inviteCode, String content, Date date)
+			throws Exception;
+
 }

--
Gitblit v1.8.0