From b651fb598b4da4ffa734a372e8d1b0b01eeef3fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 16:10:19 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 56a635a..57321ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -11,8 +11,8 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.core.task.TaskExecutor;
+import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
@@ -76,6 +76,8 @@
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+
+@Controller
@RequestMapping("api/v2/share")
public class ShareControllerV2 {
@@ -147,7 +149,7 @@
* @param recordId
* @param out
*/
- @RequestMapping(value = "getShareGoods", method = RequestMethod.POST)
+ @RequestMapping(value = "getShareGoods")
public void getShareGoods(AcceptData acceptData, Long recordId, PrintWriter out) {
if (recordId == null) {
@@ -268,14 +270,14 @@
* @param out
*/
@RequestMapping(value = "createShareInfo")
- public void createShareInfo(AcceptData acceptData, Long uid, Long auctionId, String source, Integer totalNum,
+ public void createShareInfo(AcceptData acceptData, Long uid, Long goodsId, String source, Integer totalNum,
Integer goodsType, HttpServletRequest request, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
}
- if (auctionId == null || auctionId <= 0) {
+ if (goodsId == null || goodsId <= 0) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧ID涓嶈兘涓虹┖"));
return;
}
@@ -292,11 +294,11 @@
if (goodsType == Constant.SOURCE_TYPE_JD) {
// 浜笢
- createJDShare(acceptData, uid, auctionId, source, out);
+ createJDShare(acceptData, uid, goodsId, source, out);
return;
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
// 鎷煎澶�
- createPDDShare(acceptData, uid, auctionId, source, out);
+ createPDDShare(acceptData, uid, goodsId, source, out);
return;
}
@@ -308,17 +310,17 @@
relationId = extraInfo.getRelationId();
if (source != null && "taolijin".equals(source)) {
- createTaoLijin(uid, auctionId, totalNum, relationId, request, out);
+ createTaoLijin(uid, goodsId, totalNum, relationId, request, out);
return;
}
try {
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);
+ TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);
JSONObject data = new JSONObject();
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
- auctionId + "");
+ goodsId + "");
String shortLink = HttpUtil.getShortLink(url);
if (!StringUtil.isNullOrEmpty(shortLink)) {
@@ -327,8 +329,7 @@
data.put("clickUrl", url);
data.put("token", taoBaoLink.getTaoToken());
- data.put("rule",
- "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
+ data.put("rule", configService.get("share_rule_link_tb"));
data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
String shareText = "";
@@ -377,7 +378,7 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId, Constant.SOURCE_TYPE_TAOBAO);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -415,14 +416,14 @@
});
return;
} catch (ShareGoodsException e) {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:"+uid+"auctionId:"+auctionId, "");
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:"+uid+"auctionId:"+goodsId, "");
// 鍒嗕韩鍑洪敊鎶ヨ
try {
monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "鍒嗕韩鍑洪敊"));
} catch (Exception e1) {
}
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
- businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
+ businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(goodsId + ""));
}
}
@@ -491,8 +492,7 @@
}
}
data.put("token", taoBaoLink.getTaoToken());
-
- data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
+ data.put("rule", configService.get("share_rule_link_tb"));
data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
// 鏃犲埜
@@ -620,27 +620,27 @@
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
goodsId + "", Constant.SOURCE_TYPE_JD);
+ // 鍒哥煭杩炴帴
String shortLink = HttpUtil.getShortLink(url);
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
data.put("clickUrl", url);
- // 甯姪涓績-浠嬬粛
- String rule = "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0";
- data.put("rule", rule);
+ data.put("rule", configService.get("share_rule_link_jd"));
data.put("pictUrl", jdGoods.getPicUrl());
String shareText = "";
String shopType = "浜笢浠�";
- // 鏃犲埜
+ // 鍒嗕韩妯℃澘
JDCouponInfo couponInfo = jdGoods.getCouponInfo();
if (couponInfo == null) {
String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
+ if (StringUtil.isNullOrEmpty(text)) {
text = configService.get("goods_share_text_nocoupon");
+ }
shareText = text.replace("{鏍囬}", jdGoods.getSkuName()).replace("{鍟嗗搧鍘熶环}",
MoneyBigDecimalUtil.getWithNoZera(jdGoods.getPrice()) + "");
} else// 鏈夊埜
@@ -659,6 +659,8 @@
.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(jdGoods.getInOrderCount30Days()))
.replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", null);
data.put("shareText", shareText);
+
+
String descText = shareText.replace(jdGoods.getSkuName(), "").trim();
if (descText.startsWith("\\r\\n"))
descText = descText.substring(0);
@@ -669,7 +671,7 @@
int p = (int) (array.size() * Math.random());
if (p < array.size())
data.put("notifyPicture", array.optString(p));
- data.put("notifyDesc", configService.get("goods_share_notify"));
+ data.put("notifyDesc", configService.get("goods_share_notify_jd"));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal shareRate = hongBaoManageService.getShareRate();
@@ -731,7 +733,6 @@
out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佸凡涓嬫灦"));
return;
}
-
JSONObject data = new JSONObject();
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&goodsType=%s", configService.getH5Host(),
@@ -745,8 +746,7 @@
data.put("clickUrl", url);
// 甯姪涓績-浠嬬粛
- String rule = "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0";
- data.put("rule", rule);
+ data.put("rule", configService.get("share_rule_link_pdd"));
data.put("pictUrl", goods.getGoodsImageUrl());
String shareText = "";
@@ -786,7 +786,8 @@
int p = (int) (array.size() * Math.random());
if (p < array.size())
data.put("notifyPicture", array.optString(p));
- data.put("notifyDesc", configService.get("goods_share_notify"));
+
+ data.put("notifyDesc", configService.get("goods_share_notify_pdd"));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal shareRate = hongBaoManageService.getShareRate();
--
Gitblit v1.8.0