From ff33cdfa1bd3a89ad9f5a72067b1c9b47376ef22 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 21 五月 2019 14:05:15 +0800
Subject: [PATCH] 动态邀请素材优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 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..5d3b2a2 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;
@@ -793,17 +794,25 @@
data.put("title", title);
} else { // 鏈夊浘鍒嗕韩
-
- // 閭�璇烽摼鎺�
- String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
- + 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).getUrlOriginal();
+ if (StringUtil.isNullOrEmpty(bgUrl)) {
+ out.print(JsonUtil.loadFalseResult("鍥剧墖璺緞涓嶅瓨鍦�"));
+ return;
+ }
+
+ // 鐢ㄦ埛淇℃伅
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ String portrait = userInfo.getPortrait();
+ // 鐢婚個璇峰浘鐗�
+ if (StringUtil.isNullOrEmpty(dynamicInfo.getInviteMaterialId())) {
+ String imgLink = spreadUserImgService.drawInviteQrCodeNew(bgUrl,uid, portrait, inviteCode);
+ data.put("imgLink", imgLink);
+ } else {
+ String title = imgs.get(0).getTitleOriginal();
+ String imgLink = spreadUserImgService.getInviteImgToGreet(bgUrl,uid, portrait, inviteCode, title, new Date());
+ data.put("imgLink", imgLink);
+ }
// 閭�璇疯鍒�
BusinessSystem system = new BusinessSystem();
@@ -815,6 +824,14 @@
String valueN = values.getValue();
String valueBr = valueN.replace("\n", "<br><br>");
data.put("inviteRules", valueBr);
+
+
+ // 閭�璇烽摼鎺�
+ String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+ + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
+ data.put("inviteLink", shortLink);
+ data.put("inviteCode", inviteCode);
+ data.put("helpLink", configService.get("invite_help_link"));
}
}
out.print(JsonUtil.loadTrueResult(data));
@@ -831,8 +848,11 @@
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍒嗕韩璁板綍澶辫触"));
- e.printStackTrace();
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
-
}
--
Gitblit v1.8.0