From a554e5d690e2689221fc34569280872d5926443f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 18 七月 2019 16:47:40 +0800
Subject: [PATCH] 订单调整版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 122 ++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 56 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 91a48a1..954ebb8 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
@@ -267,10 +267,11 @@
shareInfo.setShareText(shareText);
-// String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
-// if (descText.startsWith("\\r\\n"))
-// descText = descText.substring(0);
-// data.put("descText", descText);
+ String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
+ if (descText.startsWith("\\r\\n")) {
+ descText = descText.substring(0);
+ }
+ shareInfo.setDescText(descText);
// 鎻愮ず鍥炬枃鍐呭
@@ -368,8 +369,8 @@
return;
}
- JSONObject data = new JSONObject();
- data.put("spreadMoney", " 楼" + spreadMoney.toString());
+ ShareInfoVO shareInfo = new ShareInfoVO();
+ shareInfo.setSpreadMoney(" 楼" + spreadMoney.toString());
String taoLiJinLink = null;
Long tljId = null;
@@ -377,8 +378,8 @@
UserTaoLiJinRecord record = userTaoLiJinRecordService.createShareTaoLiJin(uid, totalNum, goods);
tljId = record.getId();
taoLiJinLink = record.getSendUrl();
- data.put("tljId", tljId);
- data.put("surplusMoney", record.getSurplusMoney());
+ shareInfo.setTljId(tljId.toString());
+ shareInfo.setSurplusMoney(record.getSurplusMoney().toString());
} catch (UserTaoLiJinRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
return;
@@ -391,7 +392,7 @@
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
- data.put("clickUrl", url);
+ shareInfo.setClickUrl(url);
// 鍒涘缓娣樺彛浠�
if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
@@ -406,12 +407,10 @@
taoBaoLink.setTaoToken(quanToken);
}
}
- 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));
-
+ shareInfo.setToken(taoBaoLink.getTaoToken());
+ shareInfo.setRule(configService.get("share_single_goods_rule"));
+ shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
+
// 鏃犲埜
String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "娣樺疂浠�" : "澶╃尗浠�";
String shareText = "";
@@ -439,28 +438,31 @@
shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))
.replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", taoBaoLink.getTaoToken());
- data.put("shareText", shareText);
+ shareInfo.setShareText(shareText);
+
+
String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
if (descText.startsWith("\\r\\n"))
descText = descText.substring(0);
- data.put("descText", descText);
+
+ shareInfo.setDescText(descText);
String imgs = configService.get("goods_share_notify_imgs");
JSONArray array = JSONArray.fromObject(imgs);
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"));
+ if (p < array.size()) {
+ shareInfo.setNotifyPicture(array.optString(p));
+ }
+ shareInfo.setNotifyDesc(configService.get("goods_share_notify"));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal rate = hongBaoManageService.getShareRate();
BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
-
- data.put("shareMoney", "楼" + shareMoney.toString());
+ shareInfo.setShareMoney("楼" + shareMoney.toString());
try {
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,
Constant.SOURCE_TYPE_TAOBAO);
- data.put("shareId", shareRecord.getRedisKey());
+ shareInfo.setShareId(shareRecord.getRedisKey());
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -468,7 +470,7 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(data));
+ out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
final TaoBaoLink taobaoLink = taoBaoLink;
// 寮傛鎿嶄綔
@@ -531,7 +533,8 @@
return;
}
- JSONObject data = new JSONObject();
+ // TODO
+ ShareInfoVO shareInfo = new ShareInfoVO();
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&goodsType=%s", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
goodsId + "", Constant.SOURCE_TYPE_JD);
@@ -542,12 +545,12 @@
url = shortLink;
}
- data.put("clickUrl", url);
- data.put("rule", configService.get("share_rule_link_jd"));
- data.put("pictUrl", jdGoods.getPicUrl());
+ shareInfo.setClickUrl(url);
+ shareInfo.setRule(configService.get("share_rule_link_jd"));
+ shareInfo.setPictUrl(jdGoods.getPicUrl());
+
String shareText = "";
-
String shopType = "浜笢浠�";
// 鍒嗕韩妯℃澘
@@ -574,29 +577,32 @@
shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(jdGoods.getInOrderCount30Days())).replace("{棰嗗埜鐭摼}", shortLink)
.replace("{娣樺彛浠", null);
- data.put("shareText", shareText);
+ shareInfo.setShareText(shareText);
String descText = shareText.replace(jdGoods.getSkuName(), "").trim();
- if (descText.startsWith("\\r\\n"))
+ if (descText.startsWith("\\r\\n")) {
descText = descText.substring(0);
- data.put("descText", descText);
+ }
+ shareInfo.setDescText(descText);
+
//
String imgs = configService.get("goods_share_notify_imgs");
JSONArray array = JSONArray.fromObject(imgs);
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_jd"));
+ if (p < array.size()) {
+ shareInfo.setNotifyPicture(array.optString(p));
+ }
+ shareInfo.setNotifyDesc(configService.get("goods_share_notify_jd"));
+
// 娣诲姞鍒嗕韩璁板綍
BigDecimal shareRate = hongBaoManageService.getShareRate();
BigDecimal shareMoney = JDUtil.getGoodsFanLiMoney(jdGoods, shareRate);
-
- data.put("shareMoney", "楼" + shareMoney.toString());
+ shareInfo.setShareMoney("楼" + shareMoney.toString());
try {
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
Constant.SOURCE_TYPE_JD);
- data.put("shareId", shareRecord.getRedisKey());
+ shareInfo.setShareId(shareRecord.getRedisKey());
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -604,7 +610,7 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(data));
+ out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
// 寮傛鎿嶄綔
final JDGoods goods = jdGoods;
@@ -649,7 +655,9 @@
return;
}
- JSONObject data = new JSONObject();
+ ShareInfoVO shareInfo = new ShareInfoVO();
+
+ // TODO
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&goodsType=%s", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
goodsId + "", Constant.SOURCE_TYPE_PDD);
@@ -659,13 +667,11 @@
url = shortLink;
}
- data.put("clickUrl", url);
- // 甯姪涓績-浠嬬粛
- data.put("rule", configService.get("share_rule_link_pdd"));
- data.put("pictUrl", goods.getGoodsImageUrl());
+ shareInfo.setClickUrl(url);
+ shareInfo.setRule(configService.get("share_rule_link_pdd"));
+ shareInfo.setPictUrl(goods.getGoodsImageUrl());
String shareText = "";
-
String shopType = "鎷煎澶氫环";
// 鏃犲埜
@@ -692,29 +698,33 @@
shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
.replace("{鏈堥攢閲弣", PinDuoDuoUtil.getSaleCount(goods.getSoldQuantity())).replace("{棰嗗埜鐭摼}", shortLink)
.replace("{娣樺彛浠", null);
- data.put("shareText", shareText);
+ shareInfo.setShareText(shareText);
+
String descText = shareText.replace(goods.getGoodsName(), "").trim();
- if (descText.startsWith("\\r\\n"))
+ if (descText.startsWith("\\r\\n")) {
descText = descText.substring(0);
- data.put("descText", descText);
+ }
+ shareInfo.setDescText(descText);
+
//
String imgs = configService.get("goods_share_notify_imgs");
JSONArray array = JSONArray.fromObject(imgs);
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_pdd"));
+ if (p < array.size()) {
+ shareInfo.setNotifyPicture(array.optString(p));
+ }
+ shareInfo.setNotifyDesc(configService.get("goods_share_notify_pdd"));
+
// 娣诲姞鍒嗕韩璁板綍
BigDecimal shareRate = hongBaoManageService.getShareRate();
BigDecimal shareMoney = PinDuoDuoUtil.getGoodsFanLiMoney(goods, shareRate);
-
- data.put("shareMoney", "楼" + shareMoney.toString());
+ shareInfo.setShareMoney("楼" + shareMoney.toString());
+
try {
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
Constant.SOURCE_TYPE_JD);
- data.put("shareId", shareRecord.getRedisKey());
+ shareInfo.setShareId(shareRecord.getRedisKey());
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -722,7 +732,7 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(data));
+ out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
// 寮傛鎿嶄綔
com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
--
Gitblit v1.8.0