From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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 c06210a..fc910da 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,10 +21,11 @@
* @param uid
* @return
*/
- List<String> getUserSpreadImg(Long uid);
+ List<String> getUserSpreadImg(Long uid, HttpServletRequest request);
/**
* 鐢ㄦ埛鍒嗕韩鍥剧殑鏁伴噺
+ *
* @param uid
* @return
*/
@@ -49,7 +53,41 @@
*/
String getUserSpreadImg(Long uid, String bgImg, int erCodePostionX, int erCodePostionY, int erCodeSize);
-
- String getInviteImg(Long uid, String bgImg, String inviteCode) throws Exception;
+ /**
+ * 鏍规嵁鍥剧墖鐢讳簩缁寸爜
+ *
+ * @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;
+
+ /**
+ * 鑾峰彇鐢ㄦ埛瑕佹眰鍥惧垪琛�
+ *
+ * @param uid
+ * @param page
+ * @param count
+ * @param request
+ * @return
+ */
+ public List<String> getUserSpreadImgToPage(Long uid, int page, int count, HttpServletRequest request);
}
--
Gitblit v1.8.0