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 | 746 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 445 insertions(+), 301 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 d6ef71e..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
@@ -21,6 +21,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
@@ -31,14 +32,16 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
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;
-import com.yeshi.fanli.exception.ShareGoodsException;
import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
@@ -49,27 +52,27 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.VersionUtil;
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;
@@ -79,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;
@@ -154,21 +158,58 @@
@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
- * @param uid -鐢ㄦ埛ID
- * @param auctionId-鍟嗗搧ID
+ * @param uid
+ * -鐢ㄦ埛ID
+ * @param goodsId-鍟嗗搧ID
+ * @param source
+ * @param totalNum
+ * @param goodsType
+ * @param needGoods
+ * -鏄惁闇�瑕佸晢鍝佷俊鎭�
+ * @param request
* @param out
*/
@RequestMapping(value = "createShareInfo")
public void createShareInfo(AcceptData acceptData, Long uid, Long goodsId, String source, Integer totalNum,
- Integer goodsType, HttpServletRequest request, PrintWriter out) {
-
+ Integer goodsType, Boolean needGoods, HttpServletRequest request, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
+ }
+
+ if (needGoods == null)
+ needGoods = false;
+ try {
+ // 鏃ュ織璁板綍
+ String info = String.format("type=share&uid=%s&goodsId=%s&source=%s&goodsType=%s", uid, goodsId, source,
+ goodsType);
+ LogHelper.orderInfo(info);
+ } catch (Exception e) {
}
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
@@ -184,21 +225,25 @@
// 娣樺疂
if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
- createTaoBaoShare(acceptData, uid, goodsId, totalNum, source, request, out);
+ createTaoBaoShare(acceptData, uid, goodsId, totalNum, source, needGoods, request, out);
return;
}
// 浜笢
if (goodsType == Constant.SOURCE_TYPE_JD) {
- createJDShare(acceptData, uid, goodsId, source, out);
+ createJDShare(acceptData, uid, goodsId, source, needGoods, out);
return;
}
// 鎷煎澶�
if (goodsType == Constant.SOURCE_TYPE_PDD) {
- createPDDShare(acceptData, uid, goodsId, source, out);
+ createPDDShare(acceptData, uid, goodsId, source, needGoods, out);
return;
}
+ }
+
+ public static String getERCodeContent(String template, TaoBaoGoodsBrief goods, String token) {
+ return template.replace("[娣樺彛浠", token);
}
/**
@@ -213,9 +258,20 @@
* @param out
*/
public void createTaoBaoShare(AcceptData acceptData, Long uid, Long goodsId, Integer totalNum, String source,
- HttpServletRequest request, PrintWriter out) {
+ Boolean needGoods, HttpServletRequest request, PrintWriter out) {
+ if (needGoods == null)
+ needGoods = false;
UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ UserInfoExtra userExtraInfo = userInfoExtraService.getUserInfoExtra(uid);
+ String inviteCode = null;
+ if (userExtraInfo != null) {
+ if (!StringUtil.isNullOrEmpty(userExtraInfo.getInviteCodeVip())) {
+ inviteCode = userExtraInfo.getInviteCodeVip();
+ } else {
+ inviteCode = userExtraInfo.getInviteCode();
+ }
+ }
String relationId = null;
if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null
&& extraInfo.getRelationValid() == true)
@@ -227,129 +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);
-
- 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(taoBaoLink.getTaoToken());
- shareInfo.setRule(configService.get("share_single_goods_rule"));
- shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
-
- String shareText = "";
- // 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "娣樺疂浠�" : "澶╃尗浠�";
-
- 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("{娣樺彛浠", 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);
-
- // 鎻愮ず鍥炬枃鍐呭
- 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);
- 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(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 + ""));
}
}
@@ -367,14 +307,28 @@
public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request,
PrintWriter out) {
try {
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId);
+ TaoBaoGoodsBrief goods = null;
+ try {
+ goods = TaoKeApiUtil.searchGoodsDetail(auctionId);
+ } catch (TaobaoGoodsDownException e2) {
+ e2.printStackTrace();
+ }
- TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
+ if (goods == null) {
+ out.print(JsonUtil.loadFalseResult("鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
+ if (goods.getTkRate() == null || goods.getTkRate().compareTo(new BigDecimal(0)) <= 0) {
+ // TaoKeApiUtil.specialConvertCoupon(auctionId, app);
+
+ }
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date());
+ LogHelper.error("鎺ㄥ箍绾㈠寘姣斾緥:" + warningRate);
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
-
+ LogHelper.error("鎺ㄥ箍绾㈠寘:" + spreadMoney);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佹窐绀奸噾涓嶈冻"));
@@ -406,73 +360,71 @@
}
shareInfo.setClickUrl(url);
+ TaoBaoLink taoBaoLink = new TaoBaoLink();
+ taoBaoLink.setCouponLink(taoLiJinLink);
+ taoBaoLink.setClickUrl(taoLiJinLink);
+
// 鍒涘缓娣樺彛浠�
if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink);
if (!StringUtil.isNullOrEmpty(quanToken)) {
taoBaoLink.setTaoToken(quanToken);
}
- } else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) {
- String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),
- taoBaoLink.getClickUrl());
- if (!StringUtil.isNullOrEmpty(quanToken)) {
- taoBaoLink.setTaoToken(quanToken);
- }
}
- shareInfo.setToken(taoBaoLink.getTaoToken());
- shareInfo.setRule(configService.get("share_single_goods_rule"));
- shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
+ shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareSingleGoodsRule.getKey()));
+ shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(goods.getPictUrl(), 500));
// 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "娣樺疂浠�" : "澶╃尗浠�";
+ String shopType = goods.getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO
+ : TaoBaoConstant.SHARE_PRICE_TM;
String shareText = "";
- if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
+ if (StringUtil.isNullOrEmpty(goods.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()) + "");
+ text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
+ shareText = text.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}",
+ MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
} else// 鏈夊埜
{
String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configTaoLiJinService.getValueByKey("goods_share_text");
+ text = configTaoLiJinService.getValueByKey("goods_share_text", new Date());
- shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
- .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
- .replace("{浼樻儬鍒搁潰棰潁",
- MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
+ shareText = text.replace("{鏍囬}", goods.getTitle())
+ .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "")
+ .replace("{浼樻儬鍒搁潰棰潁", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
.replace("{娣樼ぜ閲戦潰棰潁", MoneyBigDecimalUtil.getWithNoZera(spreadMoney).toString())
- .replace("{浼樻儬鍒镐环}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
+ .replace("{浼樻儬鍒镐环}", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
}
shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
- .replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))
- .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", taoBaoLink.getTaoToken());
+ .replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{棰嗗埜鐭摼}", shortLink)
+ .replace("{娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
shareInfo.setShareText(shareText);
- String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
+ String descText = shareText.replace(goods.getTitle(), "").trim();
if (descText.startsWith("\\r\\n"))
descText = descText.substring(0);
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();
- BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
+ BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(goods, rate);
shareInfo.setShareMoney("楼" + shareMoney.toString());
try {
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,
- Constant.SOURCE_TYPE_TAOBAO);
+ Constant.SOURCE_TYPE_TAOBAO, true);
shareInfo.setShareId(shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -482,6 +434,168 @@
}
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
+
+ final TaoBaoLink taobaoLink = taoBaoLink;
+ final TaoBaoGoodsBrief finalGoods = goods;
+ // 寮傛鎿嶄綔
+ 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(finalGoods.getAuctionId());
+ history.setPostPicture(finalGoods.getPictUrl());
+ history.setShareImg(taobaoLink.getClickUrl());
+ List<String> imgList = finalGoods.getImgList();
+ if (imgList == null) {
+ imgList = new ArrayList<>();
+ }
+ history.setPictures(JsonUtil.getGson().toJson(imgList));
+ shareGoodsService.addShareGoodsHistory(history);
+ }
+ });
+ return;
+ } catch (Exception e) {
+ 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;
// 寮傛鎿嶄綔
@@ -494,12 +608,11 @@
history.setHongbao(shareMoney);
history.setCreateTime(new Date());
history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);
- history.setTkCode(taobaoLink.getTaoToken());
+ 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<>();
@@ -510,14 +623,9 @@
});
return;
} catch (ShareGoodsException e) {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + "auctionId:" + auctionId, "");
- // 鍒嗕韩鍑洪敊鎶ヨ
- try {
- monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "鍒嗕韩鍑洪敊"));
- } catch (Exception e1) {
- }
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + " goodsId:" + goodsId, "");
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
- businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
+ businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(goodsId + ""));
}
}
@@ -532,61 +640,61 @@
* @param request
* @param out
*/
- public void createJDShare(AcceptData acceptData, Long uid, Long goodsId, String source, PrintWriter out) {
-
- JDGoods jdGoods = JDApiUtil.queryGoodsDetail(goodsId);
+ public void createJDShare(AcceptData acceptData, Long uid, Long goodsId, String source, boolean needGoods,
+ PrintWriter out) {
+ JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
if (jdGoods == null) {
- jdGoods = JDApiUtil.getGoodsDetail(goodsId);
- }
-
- if (jdGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佹窐宸蹭笅鏋�"));
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佸凡涓嬫灦"));
return;
}
- // 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);
+ // String url = String.format("http://%s%s?uid=%s&id=%s",
+ // configService.getH5Host(),
+ // Constant.systemCommonConfig.getShareGoodsPagePathJD(),
+ // AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+ // goodsId + "");
- // 鍒哥煭杩炴帴
- String shortLink = HttpUtil.getShortLink(url);
- if (!StringUtil.isNullOrEmpty(shortLink)) {
- url = shortLink;
+ String couponUrl = null;
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods);
+ if (couponInfo != null) {
+ couponUrl = couponInfo.getLink();
}
+ String materialId = "https://item.jd.com/" + goodsId + ".html";
+ String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "",
+ uid + "");
- shareInfo.setClickUrl(url);
- shareInfo.setRule(configService.get("share_rule_link_jd"));
+ ShareInfoVO shareInfo = new ShareInfoVO();
+ shareInfo.setClickUrl(jumpLink);
+ shareInfo.setWxErCode(jumpLink);
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareRuleLinkJD.getKey()));
shareInfo.setPictUrl(jdGoods.getPicUrl());
+ shareInfo.setCommentTexts(new ArrayList<>());
+
+ if (needGoods)
+ shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,
+ hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion())));
String shareText = "";
- String shopType = "浜笢浠�";
+ boolean hasCoupon = false;
// 鍒嗕韩妯℃澘
- JDCouponInfo couponInfo = jdGoods.getCouponInfo();
- if (couponInfo == null) {
- String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
- if (StringUtil.isNullOrEmpty(text)) {
- text = configService.get("goods_share_text_nocoupon");
- }
- shareText = text.replace("{鏍囬}", jdGoods.getSkuName()).replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(jdGoods.getPrice()) + "");
- } else// 鏈夊埜
- {
- String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_coupon");
+ ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);
+ if (couponInfo == null) { // 鏃犲埜妯℃澘
+ if (textTemplate != null)
+ shareText = textTemplate.getShareJDTextTemplate();
- shareText = text.replace("{鏍囬}", jdGoods.getSkuName())
- .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(jdGoods.getPrice()) + "")
- .replace("{浼樻儬鍒搁潰棰潁", MoneyBigDecimalUtil.getWithNoZera(couponInfo.getDiscount()) + "")
- .replace("{浼樻儬鍒镐环}", JDUtil.getQuanPrice(jdGoods) + "");
+ if (StringUtil.isNullOrEmpty(shareText))
+ shareText = configService.get(ConfigKeyEnum.goodsShareTextNoCouponJD.getKey());
+ } else { // 鏈夊埜妯℃澘
+ hasCoupon = true;
+ if (textTemplate != null)
+ shareText = textTemplate.getShareJDTextTemplateCoupon();
+
+ if (StringUtil.isNullOrEmpty(shareText))
+ shareText = configService.get(ConfigKeyEnum.goodsShareTextCouponJD.getKey());
}
-
- shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
- .replace("{鏈堥攢閲弣", JDUtil.getSaleCount(jdGoods.getInOrderCount30Days())).replace("{棰嗗埜鐭摼}", shortLink)
- .replace("{娣樺彛浠", null);
+ shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, jumpLink,
+ hasCoupon);
shareInfo.setShareText(shareText);
String descText = shareText.replace(jdGoods.getSkuName(), "").trim();
@@ -595,14 +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();
@@ -610,7 +717,7 @@
shareInfo.setShareMoney("楼" + shareMoney.toString());
try {
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
- Constant.SOURCE_TYPE_JD);
+ Constant.SOURCE_TYPE_JD, false);
shareInfo.setShareId(shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -619,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;
@@ -637,6 +755,7 @@
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getPicUrl());
+ history.setShareImg(jumpLink);
List<String> imgList = goods.getImageList();
if (imgList == null) {
@@ -657,56 +776,60 @@
* @param source
* @param out
*/
- public void createPDDShare(AcceptData acceptData, Long uid, Long goodsId, String source, PrintWriter out) {
- PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(goodsId);
+ public void createPDDShare(AcceptData acceptData, Long uid, Long goodsId, String source, boolean needGoods,
+ PrintWriter out) {
+ PDDGoodsDetail goods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
if (goods == null) {
out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佸凡涓嬫灦"));
return;
}
+ // String url = String.format("http://%s%s?uid=%s&id=%s",
+ // configService.getH5Host(),
+ // Constant.systemCommonConfig.getShareGoodsPagePathPDD(),
+ // AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+ // goodsId + "");
+
+ String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", uid + "");
+
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);
-
- String shortLink = HttpUtil.getShortLink(url);
- if (!StringUtil.isNullOrEmpty(shortLink)) {
- url = shortLink;
- }
-
- shareInfo.setClickUrl(url);
- shareInfo.setRule(configService.get("share_rule_link_pdd"));
+ shareInfo.setClickUrl(jumpLink);
+ shareInfo.setWxErCode(jumpLink);
+ shareInfo.setCommentTexts(new ArrayList<>());
+ shareInfo.setRule(configService.get(ConfigKeyEnum.shareRuleLinkPDD.getKey()));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
-
- String shareText = "";
- String shopType = "鎷煎澶氫环";
-
- // 鏃犲埜
- if (goods.getHasCoupon() == null || !goods.getHasCoupon()) {
- String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_nocoupon");
- shareText = text.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())) + "");
- } else// 鏈夊埜
- {
- String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_coupon");
-
- shareText = text.replace("{鏍囬}", goods.getGoodsName())
- .replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())) + "")
- .replace("{浼樻儬鍒搁潰棰潁",
- MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getCouponDiscount())) + "")
- .replace("{浼樻儬鍒镐环}", PinDuoDuoUtil.getQuanPrice(goods) + "");
+ if (needGoods) {
+ shareInfo
+ .setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods,
+ new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+ hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate())));
}
- shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
- .replace("{鏈堥攢閲弣", goods.getSalesTip()).replace("{棰嗗埜鐭摼}", shortLink)
- .replace("{娣樺彛浠", null);
+ String template = "";
+ boolean hasCoupon = false;
+ ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);
+ if (goods.getHasCoupon() == null || !goods.getHasCoupon()) {
+ if (textTemplate != null)
+ template = textTemplate.getSharePDDTextTemplate();
+
+ if (StringUtil.isNullOrEmpty(template))
+ template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());
+ } else {
+ hasCoupon = true;
+ if (textTemplate != null)
+ template = textTemplate.getSharePDDTextTemplateCoupon();
+
+ if (StringUtil.isNullOrEmpty(template))
+ template = configService.get(ConfigKeyEnum.goodsShareTextCouponPDD.getKey());
+ }
+
+ // 鍒涘缓鍙ｄ护
+ String token = PinDuoDuoApiUtil.createGenerate(goodsId);
+
+ // 鐢熸垚鍒嗕韩鍐呭
+ String shareText = shareGoodsTextTemplateService.createContentByTemplatePDD(template, uid, goods, jumpLink,
+ hasCoupon, token);
shareInfo.setShareText(shareText);
String descText = shareText.replace(goods.getGoodsName(), "").trim();
@@ -716,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();
@@ -731,7 +854,7 @@
try {
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,
- Constant.SOURCE_TYPE_JD);
+ Constant.SOURCE_TYPE_PDD, false);
shareInfo.setShareId(shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -740,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() {
@@ -751,13 +885,13 @@
history.setUser(new UserInfo(uid));
history.setHongbao(shareMoney);
history.setCreateTime(new Date());
- history.setGoodsType(Constant.SOURCE_TYPE_JD);
+ history.setGoodsType(Constant.SOURCE_TYPE_PDD);
history.setTkCode(null);
history.setLink(null);
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getGoodsImageUrl());
-
+ history.setShareImg(jumpLink);
List<String> imgList = null;
String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();
if (goodsGalleryUrls != null) {
@@ -805,12 +939,12 @@
return;
}
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
createJDViewText(goodsType, uid, template, goodsId, hasCoupon, out);
return;
}
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (goodsType == Constant.SOURCE_TYPE_PDD) {
createPDDViewText(goodsType, uid, template, goodsId, hasCoupon, out);
return;
}
@@ -959,10 +1093,14 @@
}
}
- 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);
+ String couponUrl = null;
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
+ if (couponInfo != null) {
+ couponUrl = couponInfo.getLink();
+ }
+ String materialId = "https://item.jd.com/" + goodsId + ".html";
+ String shortLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "",
+ uid + "");
String content = shareGoodsTextTemplateService.createContentByTemplateJD(template, uid, goods, shortLink,
hasCoupon);
@@ -972,7 +1110,7 @@
}
/**
- * 鍒涘缓浜笢鍒嗕韩妯℃澘
+ * 鍒涘缓鎷煎澶氬垎浜ā鏉�
*
* @param uid
* @param template
@@ -1014,11 +1152,15 @@
}
}
- // 鍒涘缓h5杩炴帴
- 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);
+ // // 鍒涘缓h5杩炴帴
+ // 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);
+
+ String shortLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", uid + "");
// 鍒涘缓鍙ｄ护
String token = PinDuoDuoApiUtil.createGenerate(goodsId);
@@ -1047,17 +1189,17 @@
if (tljId != null) {
template = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configTaoLiJinService.getValueByKey("goods_share_text");
+ template = configTaoLiJinService.getValueByKey("goods_share_text", new Date());
} 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);
@@ -1066,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) {
@@ -1074,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) {
@@ -1084,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) {
@@ -1092,7 +1234,7 @@
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_nocoupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());
}
}
}
@@ -1140,14 +1282,15 @@
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
if (tljId != null) {
- out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules")));
+ 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())));
}
}
@@ -1221,7 +1364,8 @@
*
* @param acceptData
* @param uid
- * @param hasCoupon -鏄惁鏈夊埜
+ * @param hasCoupon
+ * -鏄惁鏈夊埜
* @param out
*/
@RequestMapping(value = "resetShareTextTemplate", method = RequestMethod.POST)
@@ -1237,7 +1381,7 @@
return;
}
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
if (hasCoupon) {
if (tljId != null) {
shareGoodsTextTemplateService.resetTaoLijinTemplate(uid);
@@ -1247,21 +1391,20 @@
} else {
shareGoodsTextTemplateService.resetCommonTemplate(uid);
}
- } else if (goodsType == Constant.SOURCE_TYPE_JD) {
- if (hasCoupon) {
+ } else if (goodsType == Constant.SOURCE_TYPE_JD) {
+ if (hasCoupon) {
shareGoodsTextTemplateService.resetCouponTemplateJD(uid);
} else {
shareGoodsTextTemplateService.resetCommonTemplateJD(uid);
}
- } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- if (hasCoupon) {
+ } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+ if (hasCoupon) {
shareGoodsTextTemplateService.resetCouponTemplatePDD(uid);
} else {
shareGoodsTextTemplateService.resetCommonTemplatePDD(uid);
}
- }
-
-
+ }
+
if (goodsId != null) {
viewShareTextTemplate(acceptData, uid, null, goodsType, goodsId, tljId, hasCoupon, out);
return;
@@ -1320,8 +1463,9 @@
}
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -1360,7 +1504,7 @@
dataObject.put("totalOrder", goodsGroup.getTotalOrder());
dataObject.put("totalMoney", "楼" + goodsGroup.getTotalMoney());
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
detailVO.setId(commonGoods.getId());
dataObject.put("goods", gson.toJson(detailVO));
array.add(dataObject);
--
Gitblit v1.8.0