From 6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:27:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 d28c540..5590389 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
@@ -251,7 +251,7 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -316,7 +316,6 @@
TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
-
// 璁＄畻鎺ㄥ箍绾㈠寘
String warningRate = configTaoLiJinService.getValueByKey("warning_value");
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
@@ -328,7 +327,7 @@
}
JSONObject data = new JSONObject();
- data.put("spreadMoney", "娣樼ぜ閲� 楼" + spreadMoney.toString());
+ data.put("spreadMoney", " 楼" + spreadMoney.toString());
String taoLiJinLink = null;
Long tljId = null;
@@ -345,7 +344,7 @@
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
- auctionId + "", tljId);
+ auctionId + "",AESUtil.encrypt(tljId + "", Constant.UIDAESKEY));
String shortLink = HttpUtil.getShortLink(url);
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
@@ -354,19 +353,18 @@
// 鍒涘缓娣樺彛浠�
- String taoToken = null;
if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink);
if (!StringUtil.isNullOrEmpty(quanToken)) {
- taoToken = quanToken;
+ taoBaoLink.setTaoToken(quanToken);
}
} else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) {
String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl());
if (!StringUtil.isNullOrEmpty(quanToken)) {
- taoToken = quanToken;
+ taoBaoLink.setTaoToken(quanToken);
}
}
- data.put("token", taoToken);
+ 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("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
@@ -417,7 +415,7 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -587,7 +585,7 @@
@RequestMapping(value = "sharedetail", method = RequestMethod.POST)
public void shareDetail(AcceptData acceptData, Long uid, Long auctionId, String type, PrintWriter out) {
try {
- userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId);
+ userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
out.print(JsonUtil.loadTrueResult("鍒嗕韩鎴愬姛"));
} catch (UserShareGoodsRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0