From 3a7a632f98016f0041366c579517a05ca06fa903 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 18 十二月 2019 16:29:45 +0800
Subject: [PATCH] 京东订单爬取时间优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 4dbe52b..6a7bea8 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
@@ -219,19 +219,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);
}
/**
@@ -285,7 +274,8 @@
if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {
ConfigParamsDTO dto = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
- hongBaoManageService.getShareRate(), new BigDecimal(80));
+ hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);
shareInfo.setGoodsInfo(goodsInfo);
}
@@ -362,9 +352,9 @@
// 娴嬭瘯
// 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("taobao_share_qrcode_text"), taoBaoLink.getGoods(), shareInfo.getToken()));
- shareInfo.setWxErCode(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setWxErCode(getERCodeContent(configService.get("taobao_share_qrcode_text"), taoBaoLink.getGoods(), shareInfo.getToken()));
// 鎻愮ず鍥炬枃鍐呭
String imgs = configService.get("goods_share_notify_imgs");
@@ -651,8 +641,11 @@
shareInfo.setCommentTexts(new ArrayList<>());
if (needGoods)
- shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods, new ConfigParamsDTO(
- hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), new BigDecimal(80))));
+ shareInfo
+ .setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,
+ new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+ hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate())));
String shareText = "";
boolean hasCoupon = false;
@@ -767,8 +760,11 @@
shareInfo.setRule(configService.get("share_rule_link_pdd"));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
if (needGoods) {
- shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods, new ConfigParamsDTO(
- hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), new BigDecimal(80))));
+ shareInfo
+ .setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods,
+ new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+ hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate())));
}
String template = "";
@@ -1419,7 +1415,8 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
--
Gitblit v1.8.0