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/QrCodeService.java |  134 +++++++++++++++++++++++++++++++-------------
 1 files changed, 94 insertions(+), 40 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/QrCodeService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/QrCodeService.java
index 44a51a3..583a6b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/QrCodeService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/QrCodeService.java
@@ -1,40 +1,94 @@
-package com.yeshi.fanli.service.inter.user;
-
-import java.io.IOException;
-
-public interface QrCodeService {
-
-	String getPortrait(Long uid);
-
-	/**
-	 * 鐢熸垚閭�璇疯禋鐨勫浘鐗�
-	 * 
-	 * @param url
-	 * @param uid
-	 * @param portrait
-	 * @return
-	 * @throws IOException
-	 */
-	String drawInviteQrCode(String url, Long uid, String portrait,String inviteCode) throws IOException;
-
-	/**
-	 * 缁樺埗閭�璇蜂簩缁寸爜
-	 * 
-	 * @param url
-	 *            -鑳屾櫙鍥鹃摼鎺�
-	 * @param uid
-	 *            -鐢ㄦ埛ID
-	 * @param portrait
-	 *            -澶村儚璺緞
-	 * @param erCodePostionX
-	 *            浜岀淮鐮佸潗鏍嘪
-	 * @param erCodePostionY
-	 *            浜岀淮鐮佸潗鏍嘫
-	 * @param erCodeSize
-	 *            浜岀淮鐮佸昂瀵�
-	 * @return
-	 * @throws IOException
-	 */
-	String drawInviteQrCode(String url, Long uid, String portrait, int erCodePostionX, int erCodePostionY,
-			int erCodeSize,String inviteCode) throws IOException;
-}
+package com.yeshi.fanli.service.inter.user;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+
+import org.yeshi.utils.entity.FileUploadResult;
+
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+
+public interface QrCodeService {
+
+	String getPortrait(Long uid);
+
+	/**
+	 * 鐢熸垚閭�璇疯禋鐨勫浘鐗�
+	 * 
+	 * @param url
+	 * @param uid
+	 * @param portrait
+	 * @return
+	 * @throws IOException
+	 */
+	String drawInviteQrCode(String url, Long uid, String portrait,String inviteCode) throws IOException;
+
+	/**
+	 * 缁樺埗閭�璇蜂簩缁寸爜
+	 * 
+	 * @param url
+	 *            -鑳屾櫙鍥鹃摼鎺�
+	 * @param uid
+	 *            -鐢ㄦ埛ID
+	 * @param portrait
+	 *            -澶村儚璺緞
+	 * @param erCodePostionX
+	 *            浜岀淮鐮佸潗鏍嘪
+	 * @param erCodePostionY
+	 *            浜岀淮鐮佸潗鏍嘫
+	 * @param erCodeSize
+	 *            浜岀淮鐮佸昂瀵�
+	 * @return
+	 * @throws IOException
+	 */
+	String drawInviteQrCode(String url, Long uid, String portrait, int erCodePostionX, int erCodePostionY,
+			int erCodeSize,String inviteCode) throws IOException;
+
+	/**
+	 * 閭�璇烽棶鍊�
+	 * @param url 鑳屾櫙鍥鹃摼鎺�
+	 * @param uid  鐢ㄦ埛id 涓虹┖鏃堕粯璁ゅ畼缃�
+	 * @param portrait   澶村儚          涓虹┖鏃堕粯璁ゅ畼缃�
+	 * @param inviteCode 閭�璇风爜      涓虹┖鏃堕粯璁ゅ畼缃�
+	 * @param content  鍥剧墖鏂囧瓧鍐呭
+	 * @param date   鏃ユ湡
+	 * @return
+	 * @throws IOException
+	 */
+	public String drawInviteToGreet(String url, Long uid, String portrait, String inviteCode, String content, Date date)
+			throws IOException;
+
+	/**
+	 * uid涓虹┖鏃�  榛樿瀹樻柟
+	 * @param url
+	 * @param uid
+	 * @param portrait
+	 * @param inviteCode
+	 * @return
+	 * @throws IOException
+	 */
+	public String drawInviteQrCodeNew(InputStream urlInputStream,String urlMd5, Long uid, String portrait, Integer pX, Integer pY, Integer size, String inviteCode) throws IOException;
+
+	/**
+	 * 鍒嗕韩鍟嗗搧娴锋姤鍥�
+	 * @param urlInputStream
+	 * @param erCodeUrl
+	 * @param uid
+	 * @param portrait
+	 * @param goods
+	 * @return
+	 */
+	public FileUploadResult drawGoodsPoster(String erCodeUrl, String portrait,GoodsDetailVO goods);
+
+	/**
+	 * 鍒嗕韩灏忕▼搴忓悕鐗�
+	 * @param erCodeStream
+	 * @param user
+	 * @param goods
+	 * @return
+	 */
+	public FileUploadResult drawGoodsPosterXCX(InputStream erCodeStream, UserInfo user, GoodsDetailVO goods);
+
+	public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode, String mainPic, GoodsDetailVO goods);
+}

--
Gitblit v1.8.0