From b96de6a02d7269171f5cc88a5807f11ba037354c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 20 五月 2019 16:45:52 +0800
Subject: [PATCH] EHCache缓存清除,短信发送修改，未付款消息修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index 867e572..642c24a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -38,6 +38,7 @@
import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
@@ -800,10 +801,33 @@
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();
@@ -831,8 +855,11 @@
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍒嗕韩璁板綍澶辫触"));
- e.printStackTrace();
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
-
}
--
Gitblit v1.8.0