From ae0e155d723c6b955e4632b868703eb7c282503d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 08 一月 2020 17:47:57 +0800
Subject: [PATCH] 版本不同性别Redis缓存
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 129 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 63 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 6f6c493..2b9deb2 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;
@@ -219,19 +220,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);
}
/**
@@ -253,9 +243,13 @@
UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);
UserInfoExtra userExtraInfo = userInfoExtraService.getUserInfoExtra(uid);
String inviteCode = null;
- if (userExtraInfo != null)
- inviteCode = userExtraInfo.getInviteCode();
-
+ 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)
@@ -280,8 +274,9 @@
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());
+ ConfigParamsDTO dto = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);
shareInfo.setGoodsInfo(goodsInfo);
}
@@ -297,10 +292,10 @@
shareInfo.setClickUrl(url);
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(taoBaoLink.getGoods().getPictUrl(), 500));
- String commentTextStr = configService.get("share_single_goods_comment_text");
+ String commentTextStr = configService.get(ConfigKeyEnum.shareSingleGoodsCommentText.getKey());
List<String> commentTexts = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(commentTextStr)) {
JSONArray array = JSONArray.fromObject(commentTextStr);
@@ -328,14 +323,14 @@
if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().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("{鏍囬}", 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");
+ text = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
.replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
@@ -358,18 +353,20 @@
// 娴嬭瘯
// 2.0.2涔嬪墠
if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
- shareInfo.setClickUrl(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setClickUrl(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
- shareInfo.setWxErCode(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setWxErCode(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), taoBaoLink.getGoods(),
+ shareInfo.getToken()));
// 鎻愮ず鍥炬枃鍐呭
- 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();
@@ -389,7 +386,8 @@
}
}
- out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
+ out.print(JsonUtil.loadTrueResult(
+ JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
final TaoBaoLink taobaoLink = taoBaoLink;
// 寮傛鎿嶄綔
@@ -407,7 +405,7 @@
history.setQuanLink(taobaoLink.getCouponLink());
history.setGoodsId(taobaoLink.getGoods().getAuctionId());
history.setPostPicture(taobaoLink.getGoods().getPictUrl());
-
+ history.setShareImg(taobaoLink.getClickUrl());
List<String> imgList = taobaoLink.getGoods().getImgList();
if (imgList == null) {
imgList = new ArrayList<>();
@@ -508,7 +506,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));
// 鏃犲埜
@@ -519,7 +517,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// 鏈夊埜
@@ -546,13 +544,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();
@@ -588,7 +586,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<>();
@@ -642,13 +640,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;
@@ -660,14 +658,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);
@@ -679,13 +677,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();
@@ -702,7 +700,8 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
+ out.print(JsonUtil.loadTrueResult(
+ JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
// 寮傛鎿嶄綔
final JDGoods goods = jdGoods;
@@ -720,7 +719,8 @@
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getPicUrl());
-
+ history.setShareImg(jumpLink);
+
List<String> imgList = goods.getImageList();
if (imgList == null) {
imgList = new ArrayList<>();
@@ -760,11 +760,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 = "";
@@ -775,14 +778,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());
}
// 鍒涘缓鍙ｄ护
@@ -800,13 +803,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();
@@ -824,7 +827,8 @@
e1.printStackTrace();
}
}
- out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo)));
+ out.print(JsonUtil.loadTrueResult(
+ JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
// 寮傛鎿嶄綔
com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
@@ -841,7 +845,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) {
@@ -1143,13 +1147,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);
@@ -1158,7 +1162,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) {
@@ -1166,7 +1170,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) {
@@ -1176,7 +1180,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) {
@@ -1184,7 +1188,7 @@
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_nocoupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());
}
}
}
@@ -1235,12 +1239,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())));
}
}
@@ -1413,9 +1417,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