From 3ebbc15764ff0574f1024eb485e23d2df3e8730b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 17 四月 2019 11:58:40 +0800
Subject: [PATCH] 阿里云短信优化,分享信息优化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
index 2acc6d6..31945a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
@@ -81,7 +81,7 @@
 			textTemplate.setUid(uid);
 			shareGoodsTextTemplateMapper.insertSelective(textTemplate);
 		}
-		
+
 	}
 
 	@Override
@@ -115,25 +115,15 @@
 	}
 
 	@Override
-	public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods, boolean hasCoupon) {
-		String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
-				Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
-				goods.getAuctionId() + "");
-		String shortLink = HttpUtil.getShortLink(url);
-		if (!hasCoupon) {
-			String token = goods.getCouponLinkTaoToken();
-			if (StringUtil.isNullOrEmpty(token))
-				token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), goods.getAuctionUrl());
+	public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods, String token,
+			String shortLink, boolean hasCoupon) {
 
+		if (!hasCoupon) {
 			return template.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}", goods.getZkPrice().toString())
 					.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{鐭摼}", shortLink)
 					.replace("{娣樺彛浠", "").replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? "澶╃尗浠�"
 							: "娣樺疂浠�");
 		} else {
-			String token = goods.getCouponLinkTaoToken();
-			if (StringUtil.isNullOrEmpty(token))
-				token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), goods.getCouponLink());
-
 			return template.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}", goods.getZkPrice().toString())
 					.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{棰嗗埜鐭摼}", shortLink)
 					.replace("{娣樺彛浠", token).replace("{浼樻儬鍒搁潰棰潁", goods.getCouponAmount().toString())

--
Gitblit v1.8.0