From c4d752a1d340652d9c7d2abb5abff65cdee40d69 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:13:56 +0800
Subject: [PATCH] 邀请素材管理、邀请素材画图

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index c2d92e7..4f8b6c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -685,6 +685,7 @@
 				String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
 						Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
 						auctionId + "");
+				
 				String shortLink = HttpUtil.getShortLink(url);
 				if (!StringUtil.isNullOrEmpty(shortLink)) {
 					url = shortLink;
@@ -753,7 +754,7 @@
 				ShareInfoDTO shareInfo = userShareGoodsRecordService.saveShareRecord(uid, 
 						ShareSourceTypeEnum.activity, title, listGoods);
 				data.put("shareId", shareInfo.getShareId());
-				data.put("clickUrl", shareInfo.getCodeUrl());
+				data.put("clickUrl", shareInfo.getShareUrl());
 				data.put("pictUrl", TbImgUtil.getTBSizeImg(picUrl, 500));
 				// 甯姪閾炬帴
 				data.put("helpLink","http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
@@ -798,11 +799,34 @@
 							+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
 					data.put("inviteLink", shortLink);
 					data.put("inviteCode", inviteCode);
+					data.put("helpLink", configService.get("invite_help_link"));
 					
-					// 閭�璇峰浘鐗�
+					
+					// 閭�璇疯儗鏅浘鐗�
 					List<GoodsPicture> imgs = dynamicInfo.getImgs();
-					String imgLink = spreadUserImgService.getInviteImg(uid, imgs.get(0).getUrl(), inviteCode);
-					data.put("imgLink", imgLink);
+					String bgUrl = imgs.get(0).getUrl();
+					// 鐢ㄦ埛淇℃伅
+					UserInfo userInfo = userInfoService.selectByPKey(uid);
+					String portrait = userInfo.getPortrait();
+					// 鐢婚個璇峰浘鐗�
+					if (StringUtil.isNullOrEmpty(dynamicInfo.getInviteMaterialId())) {
+						String imgLink = spreadUserImgService.getInviteImg(bgUrl,uid, portrait, inviteCode);
+						data.put("imgLink", imgLink);
+					} else {
+						
+						String title ="";
+						List<ClientTextStyleVO> listTitle = dynamicInfo.getTitle();
+						if (listTitle != null && listTitle.size() > 0) {
+							for (ClientTextStyleVO textStyleVO : listTitle) {
+								title += textStyleVO.getContent();
+							}
+						}
+						title = title.replace("銆愰個璇风爜銆�", inviteCode);
+						title = title.replace("銆愰個璇烽摼鎺ャ��", UserUtil.getInviteShortLink(uid));
+						
+						String imgLink = spreadUserImgService.getInviteImgToGreet(bgUrl,uid, portrait, inviteCode, title, new Date());
+						data.put("imgLink", imgLink);
+					}
 					
 					//  閭�璇疯鍒�
 					BusinessSystem system = new BusinessSystem();

--
Gitblit v1.8.0