From 1b3856e8f5431508d944a3b9c7a444dac3536bb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 07 一月 2020 18:14:18 +0800
Subject: [PATCH] cofig
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 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 d782e60..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;
@@ -291,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);
@@ -322,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()) + "")
@@ -352,20 +353,20 @@
// 娴嬭瘯
// 2.0.2涔嬪墠
if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
- shareInfo.setClickUrl(getERCodeContent(configService.get("taobao_share_qrcode_text"),
+ shareInfo.setClickUrl(getERCodeContent(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
taoBaoLink.getGoods(), shareInfo.getToken()));
- shareInfo.setWxErCode(getERCodeContent(configService.get("taobao_share_qrcode_text"), taoBaoLink.getGoods(),
+ 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();
@@ -505,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));
// 鏃犲埜
@@ -516,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// 鏈夊埜
@@ -543,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();
@@ -639,7 +640,7 @@
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<>());
@@ -657,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);
@@ -676,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();
@@ -759,7 +760,7 @@
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
@@ -777,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());
}
// 鍒涘缓鍙ｄ护
@@ -802,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();
@@ -1146,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);
@@ -1161,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) {
@@ -1169,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) {
@@ -1179,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) {
@@ -1187,7 +1188,7 @@
}
if (StringUtil.isNullOrEmpty(template)) {
- template = configService.get("goods_share_text_nocoupon_pdd");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNocouponPDD.getKey());
}
}
}
@@ -1238,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())));
}
}
--
Gitblit v1.8.0