From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 453 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 249 insertions(+), 204 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 46c8c13..40e69b7 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
@@ -36,6 +36,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.ShareGoodsTextTemplate;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
@@ -72,7 +73,6 @@
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
-import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -82,6 +82,7 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.goods.ShareGoodsCommentChoiceInfo;
import com.yeshi.fanli.vo.goods.ShareInfoVO;
import net.sf.json.JSONArray;
@@ -157,6 +158,28 @@
@Resource
private UserTaoLiJinRecordService userTaoLiJinRecordService;
+ private List<ShareGoodsCommentChoiceInfo> getCommentChoiceList(String token, String link, String inviteCode,
+ BigDecimal fanliMoney) {
+ List<ShareGoodsCommentChoiceInfo> list = new ArrayList<>();
+ if (!StringUtil.isNullOrEmpty(token))
+ list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_TOKEN, "娣樺彛浠�", token, true, false));
+ if (!StringUtil.isNullOrEmpty(link)) {
+ list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_LINK, "閾炬帴",link, true, false));
+ }
+ if (!StringUtil.isNullOrEmpty(inviteCode)) {
+ list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_INVITE_CODE, "閭�璇风爜", inviteCode, false,
+ true));
+ }
+
+ list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_DOWNLOAD_LINK, "涓嬭浇閾炬帴", "http://www.baidu.com", false,
+ true));
+
+ list.add(
+ new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_FANLI_MONEY, "杩斿埄閲戦", "楼 "+fanliMoney, false, true));
+
+ return list;
+ }
+
/**
*
* @param acceptData
@@ -219,19 +242,8 @@
}
}
- public static String getERCodeContent(TaoBaoGoodsBrief goods, String token) {
- String content = String.format("銆�%s銆�%s鍏�", goods.getUserType() == 1 ? "T鐚环" : "T瀹濅环",
- MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
- content += "\n\r";
-
- if (!StringUtil.isNullOrEmpty(goods.getCouponInfo())) {
- content += String.format("銆愬埜鍚庝环銆�%s鍏�", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
- content += "\n\r";
- }
- content += "------------";
- content += "\n\r";
- content += "寰╁埗杩欐潯" + token + "锛岄�插叆Tao瀹濆嵆鍙喘涔�";
- return content;
+ public static String getERCodeContent(String template, TaoBaoGoodsBrief goods, String token) {
+ return template.replace("[娣樺彛浠", token);
}
/**
@@ -271,165 +283,13 @@
}
// 娣樼ぜ閲戝垱寤哄垎浜�
- if (source != null && "taolijin".equals(source)) {
+ if (source != null && "taolijin".equals(source)) {// 娣樼ぜ閲戝垎浜垱寤�
createTaoLijin(uid, goodsId, totalNum, relationId, request, out);
return;
- }
-
- try {
- ShareInfoVO shareInfo = new ShareInfoVO();
-
- // 娴嬭瘯
-
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);
-
- if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {
- ConfigParamsDTO dto = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
- hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
- GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);
- shareInfo.setGoodsInfo(goodsInfo);
- }
-
- String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
- Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
- goodsId + "");
-
- String shortLink = HttpUtil.getShortLink(url);
- if (!StringUtil.isNullOrEmpty(shortLink)) {
- url = shortLink;
- }
-
- shareInfo.setClickUrl(url);
- shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
- shareInfo.setRule(configService.get("share_single_goods_rule"));
- shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
-
- String commentTextStr = configService.get("share_single_goods_comment_text");
- List<String> commentTexts = new ArrayList<>();
- if (!StringUtil.isNullOrEmpty(commentTextStr)) {
- JSONArray array = JSONArray.fromObject(commentTextStr);
- for (int i = 0; i < array.size(); i++) {
- if (StringUtil.isNullOrEmpty(inviteCode)) {
- if (array.optString(i).contains("[閭�璇风爜]")) {
- continue;
- }
- }
- if (StringUtil.isNullOrEmpty(inviteCode))
- commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
- .replace("[娣樺彛浠", shareInfo.getToken()));
- else
- commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
- .replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", shareInfo.getToken()));
- }
- }
- shareInfo.setCommentTexts(commentTexts);
-
- String shareText = "";
- // 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO
- : TaoBaoConstant.SHARE_PRICE_TM;
-
- if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
- String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_nocoupon");
- shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()).replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "");
- } else// 鏈夊埜
- {
- String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_coupon");
-
- shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
- .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
- .replace("{浼樻儬鍒搁潰棰潁",
- MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
- .replace("{浼樻儬鍒镐环}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
- }
-
- shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
- .replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))
- .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
-
- shareInfo.setShareText(shareText);
-
- String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
- if (descText.startsWith("\\r\\n")) {
- descText = descText.substring(0);
- }
- shareInfo.setDescText(descText);
- // 娴嬭瘯
- // 2.0.2涔嬪墠
- if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
- shareInfo.setClickUrl(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
-
- shareInfo.setWxErCode(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
-
- // 鎻愮ず鍥炬枃鍐呭
- String imgs = configService.get("goods_share_notify_imgs");
- JSONArray array = JSONArray.fromObject(imgs);
- int p = (int) (array.size() * Math.random());
- 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);
- shareInfo.setShareMoney("楼" + shareMoney.toString());
-
- // 鍒嗕韩id
- try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
- Constant.SOURCE_TYPE_TAOBAO, false);
- shareInfo.setShareId(shareRecord.getRedisKey());
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
-
- out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
-
- final TaoBaoLink taobaoLink = taoBaoLink;
- // 寮傛鎿嶄綔
- com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
- @Override
- public void run() {
- // 寮傛鎿嶄綔 娣诲姞鍒嗕韩璁板綍
- UserShareGoodsHistory history = new UserShareGoodsHistory();
- history.setUser(new UserInfo(uid));
- history.setHongbao(shareMoney);
- history.setCreateTime(new Date());
- history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);
- history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken()));
- history.setLink(taobaoLink.getClickUrl());
- history.setQuanLink(taobaoLink.getCouponLink());
- history.setGoodsId(taobaoLink.getGoods().getAuctionId());
- history.setPostPicture(taobaoLink.getGoods().getPictUrl());
-
- List<String> imgList = taobaoLink.getGoods().getImgList();
- if (imgList == null) {
- imgList = new ArrayList<>();
- }
- history.setPictures(JsonUtil.getGson().toJson(imgList));
- shareGoodsService.addShareGoodsHistory(history);
- }
- });
+ } else {// 鏅�氬垎浜垱寤�
+ createCommonTaoBaoShare(acceptData.getPlatform(), acceptData.getVersion(), goodsId, inviteCode, uid,
+ needGoods, relationId, out);
return;
- } catch (ShareGoodsException e) {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + " goodsId:" + 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(goodsId + ""));
}
}
@@ -512,7 +372,7 @@
}
}
shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
- shareInfo.setRule(configService.get("share_single_goods_rule"));
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareSingleGoodsRule.getKey()));
shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(goods.getPictUrl(), 500));
// 鏃犲埜
@@ -523,7 +383,7 @@
if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) {
String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_nocoupon");
+ text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
shareText = text.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}",
MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
} else// 鏈夊埜
@@ -550,13 +410,13 @@
shareInfo.setDescText(descText);
- String imgs = configService.get("goods_share_notify_imgs");
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
if (p < array.size()) {
shareInfo.setNotifyPicture(array.optString(p));
}
- shareInfo.setNotifyDesc(configService.get("goods_share_notify"));
+ shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal rate = hongBaoManageService.getShareRate();
@@ -592,7 +452,7 @@
history.setQuanLink(taobaoLink.getCouponLink());
history.setGoodsId(finalGoods.getAuctionId());
history.setPostPicture(finalGoods.getPictUrl());
-
+ history.setShareImg(taobaoLink.getClickUrl());
List<String> imgList = finalGoods.getImgList();
if (imgList == null) {
imgList = new ArrayList<>();
@@ -606,6 +466,166 @@
LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + "auctionId:" + auctionId, "");
out.print(JsonUtil.loadFalseResult("鍒涘缓鍒嗕韩鍑洪敊"));
businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
+ }
+ }
+
+ public void createCommonTaoBaoShare(String platform, String version, Long goodsId, String inviteCode, Long uid,
+ boolean needGoods, String relationId, PrintWriter out) {
+ try {
+ ShareInfoVO shareInfo = new ShareInfoVO();
+
+ TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);
+
+ if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {
+ ConfigParamsDTO dto = hongBaoManageService.getShowComputeRate(platform, version);
+ GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);
+ shareInfo.setGoodsInfo(goodsInfo);
+ }
+
+ String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
+ Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+ goodsId + "");
+
+ String shortLink = HttpUtil.getShortLink(url);
+ if (!StringUtil.isNullOrEmpty(shortLink)) {
+ url = shortLink;
+ }
+
+ shareInfo.setClickUrl(url);
+ shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareSingleGoodsRule.getKey()));
+ shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
+
+ String commentTextStr = configService.get(ConfigKeyEnum.shareSingleGoodsCommentText.getKey());
+ List<String> commentTexts = new ArrayList<>();
+ if (!StringUtil.isNullOrEmpty(commentTextStr)) {
+ JSONArray array = JSONArray.fromObject(commentTextStr);
+ for (int i = 0; i < array.size(); i++) {
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ if (array.optString(i).contains("[閭�璇风爜]")) {
+ continue;
+ }
+ }
+ if (StringUtil.isNullOrEmpty(inviteCode))
+ commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
+ .replace("[娣樺彛浠", shareInfo.getToken()));
+ else
+ commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
+ .replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", shareInfo.getToken()));
+ }
+ }
+ shareInfo.setCommentTexts(commentTexts);
+
+ String shareText = "";
+ // 鏃犲埜
+ String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO
+ : TaoBaoConstant.SHARE_PRICE_TM;
+
+ if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
+ String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
+ if (StringUtil.isNullOrEmpty(text))
+ text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
+ shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()).replace("{鍟嗗搧鍘熶环}",
+ MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "");
+ } else// 鏈夊埜
+ {
+ String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
+ if (StringUtil.isNullOrEmpty(text))
+ text = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());
+
+ shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
+ .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
+ .replace("{浼樻儬鍒搁潰棰潁",
+ MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
+ .replace("{浼樻儬鍒镐环}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
+ }
+
+ shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
+ .replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))
+ .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+
+ shareInfo.setShareText(shareText);
+
+ String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
+ if (descText.startsWith("\\r\\n")) {
+ descText = descText.substring(0);
+ }
+ shareInfo.setDescText(descText);
+ // 娴嬭瘯
+ // 2.0.2涔嬪墠
+ if (!VersionUtil.greaterThan_2_0_2(platform, version))
+ shareInfo.setClickUrl(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
+
+ shareInfo.setWxErCode(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
+
+ // 鎻愮ず鍥炬枃鍐呭
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
+ JSONArray array = JSONArray.fromObject(imgs);
+ int p = (int) (array.size() * Math.random());
+ if (p < array.size()) {
+ shareInfo.setNotifyPicture(array.optString(p));
+ }
+ shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));
+
+ // 鍒嗕韩閲戦
+ BigDecimal rate = hongBaoManageService.getShareRate();
+ BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
+ shareInfo.setShareMoney("楼" + shareMoney.toString());
+
+ // 鍒嗕韩id
+ try {
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
+ Constant.SOURCE_TYPE_TAOBAO, false);
+ shareInfo.setShareId(shareRecord.getRedisKey());
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
+ // 璁剧疆璇勮鏂囨湰閫夐」
+ shareInfo.setCommentTextChoiceList(getCommentChoiceList(shareInfo.getToken(), null, inviteCode,
+ TaoBaoUtil.getGoodsHongBaoMoney(taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate())));
+
+ shareInfo.setCommentText(shareInfo.getShareText());
+ shareInfo.setRecommendText(shareInfo.getDescText());
+
+ out.print(JsonUtil.loadTrueResult(
+ JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
+
+ final TaoBaoLink taobaoLink = taoBaoLink;
+ // 寮傛鎿嶄綔
+ com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 寮傛鎿嶄綔 娣诲姞鍒嗕韩璁板綍
+ UserShareGoodsHistory history = new UserShareGoodsHistory();
+ history.setUser(new UserInfo(uid));
+ history.setHongbao(shareMoney);
+ history.setCreateTime(new Date());
+ history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);
+ history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken()));
+ history.setLink(taobaoLink.getClickUrl());
+ history.setQuanLink(taobaoLink.getCouponLink());
+ history.setGoodsId(taobaoLink.getGoods().getAuctionId());
+ history.setPostPicture(taobaoLink.getGoods().getPictUrl());
+ List<String> imgList = taobaoLink.getGoods().getImgList();
+ if (imgList == null) {
+ imgList = new ArrayList<>();
+ }
+ history.setPictures(JsonUtil.getGson().toJson(imgList));
+ shareGoodsService.addShareGoodsHistory(history);
+ }
+ });
+ return;
+ } catch (ShareGoodsException e) {
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + " goodsId:" + goodsId, "");
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+ businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(goodsId + ""));
}
}
@@ -646,13 +666,13 @@
ShareInfoVO shareInfo = new ShareInfoVO();
shareInfo.setClickUrl(jumpLink);
shareInfo.setWxErCode(jumpLink);
- shareInfo.setRule(configService.get("share_rule_link_jd"));
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareRuleLinkJD.getKey()));
shareInfo.setPictUrl(jdGoods.getPicUrl());
shareInfo.setCommentTexts(new ArrayList<>());
if (needGoods)
- shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods, new ConfigParamsDTO(
- hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate())));
+ shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,
+ hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion())));
String shareText = "";
boolean hasCoupon = false;
@@ -664,14 +684,14 @@
shareText = textTemplate.getShareJDTextTemplate();
if (StringUtil.isNullOrEmpty(shareText))
- shareText = configService.get("goods_share_text_nocoupon_jd");
+ shareText = configService.get(ConfigKeyEnum.goodsShareTextNoCouponJD.getKey());
} else { // 鏈夊埜妯℃澘
hasCoupon = true;
if (textTemplate != null)
shareText = textTemplate.getShareJDTextTemplateCoupon();
if (StringUtil.isNullOrEmpty(shareText))
- shareText = configService.get("goods_share_text_coupon_jd");
+ shareText = configService.get(ConfigKeyEnum.goodsShareTextCouponJD.getKey());
}
shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, jumpLink,
hasCoupon);
@@ -683,13 +703,13 @@
}
shareInfo.setDescText(descText);
- String imgs = configService.get("goods_share_notify_imgs");
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
if (p < array.size()) {
shareInfo.setNotifyPicture(array.optString(p));
}
- shareInfo.setNotifyDesc(configService.get("goods_share_notify_jd"));
+ shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotifyJD.getKey()));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal shareRate = hongBaoManageService.getShareRate();
@@ -706,7 +726,18 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
+
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+
+ // 璁剧疆璇勮鏂囨湰閫夐」
+ shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getClickUrl(), inviteCode,
+ JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getFanLiRate())));
+
+ shareInfo.setCommentText(shareInfo.getShareText());
+ shareInfo.setRecommendText(shareInfo.getDescText());
+
+ out.print(JsonUtil.loadTrueResult(
+ JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
// 寮傛鎿嶄綔
final JDGoods goods = jdGoods;
@@ -724,6 +755,7 @@
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getPicUrl());
+ history.setShareImg(jumpLink);
List<String> imgList = goods.getImageList();
if (imgList == null) {
@@ -764,11 +796,14 @@
shareInfo.setClickUrl(jumpLink);
shareInfo.setWxErCode(jumpLink);
shareInfo.setCommentTexts(new ArrayList<>());
- shareInfo.setRule(configService.get("share_rule_link_pdd"));
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareRuleLinkPDD.getKey()));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
if (needGoods) {
- shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods, new ConfigParamsDTO(
- hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate())));
+ shareInfo
+ .setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods,
+ new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+ hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate())));
}
String template = "";
@@ -779,14 +814,14 @@
template = textTemplate.getSharePDDTextTemplate();
if (StringUtil.isNullOrEmpty(template))
- template = configService.get("goods_share_text_nocoupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());
} else {
hasCoupon = true;
if (textTemplate != null)
template = textTemplate.getSharePDDTextTemplateCoupon();
if (StringUtil.isNullOrEmpty(template))
- template = configService.get("goods_share_text_coupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextCouponPDD.getKey());
}
// 鍒涘缓鍙ｄ护
@@ -804,13 +839,13 @@
shareInfo.setDescText(descText);
//
- String imgs = configService.get("goods_share_notify_imgs");
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
if (p < array.size()) {
shareInfo.setNotifyPicture(array.optString(p));
}
- shareInfo.setNotifyDesc(configService.get("goods_share_notify_pdd"));
+ shareInfo.setNotifyDesc(configService.get(ConfigKeyEnum.goodsShareNotifyPDD.getKey()));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal shareRate = hongBaoManageService.getShareRate();
@@ -828,7 +863,18 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
+
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+
+ // 璁剧疆璇勮鏂囨湰閫夐」
+ shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getClickUrl(), inviteCode,
+ PinDuoDuoUtil.getGoodsFanLiMoney(goods, hongBaoManageService.getFanLiRate())));
+
+ shareInfo.setCommentText(shareInfo.getShareText());
+ shareInfo.setRecommendText(shareInfo.getDescText());
+
+ out.print(JsonUtil.loadTrueResult(
+ JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
// 寮傛鎿嶄綔
com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
@@ -845,7 +891,7 @@
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getGoodsImageUrl());
-
+ history.setShareImg(jumpLink);
List<String> imgList = null;
String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();
if (goodsGalleryUrls != null) {
@@ -1147,13 +1193,13 @@
} else {
template = shareGoodsTextTemplateService.geteCouponTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configService.get("goods_share_text_coupon");
+ template = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());
}
} else {
template = shareGoodsTextTemplateService.getCommonTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configService.get("goods_share_text_nocoupon");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
}
} else if (goodsType == Constant.SOURCE_TYPE_JD) {
ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);
@@ -1162,7 +1208,7 @@
template = textTemplate.getShareJDTextTemplateCoupon();
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_coupon_jd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextCouponJD.getKey());
}
} else {
if (textTemplate != null) {
@@ -1170,7 +1216,7 @@
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_nocoupon_jd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNoCouponJD.getKey());
}
}
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
@@ -1180,7 +1226,7 @@
template = textTemplate.getSharePDDTextTemplateCoupon();
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_coupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextCouponPDD.getKey());
}
} else {
if (textTemplate != null) {
@@ -1188,7 +1234,7 @@
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_nocoupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());
}
}
}
@@ -1239,12 +1285,12 @@
out.print(
JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules", new Date())));
} else {
- out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules")));
+ out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRules.getKey())));
}
} else if (goodsType == Constant.SOURCE_TYPE_JD) {
- out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules_jd")));
+ out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRulesJD.getKey())));
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules_pdd")));
+ out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRulesPDD.getKey())));
}
}
@@ -1417,9 +1463,8 @@
}
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
--
Gitblit v1.8.0