From 6fdcc0c26dd33e87a024a69ed635d9aedb59cad6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 一月 2020 12:02:50 +0800
Subject: [PATCH] 订单搜索引擎增量更新
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index aae72e0..7aabad6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -61,7 +61,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
@@ -141,7 +141,7 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -362,7 +362,7 @@
// 澶ф窐瀹㈠晢鍝佽繃婊�
try {
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -375,7 +375,9 @@
goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
goodsDetail.getMoneyInfo().setShareMoney(
"楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPShareRate()));
+ goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
}
+ goodsDetail.getMoneyInfo().setRateInfoHelpUrl(configService.get("goods_detail_fanli_rate_help_url"));
if (TaoBaoUtil.isYUShou(goods)) {
if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {
@@ -532,12 +534,12 @@
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1 = new JSONObject();
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.get("special_guide_reward_coupon_link"));
else
params1.put("url", configService.get("vip_link"));
rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
rewardCoupon.setDesc("杩�");
params1.put("url", configService.get("vip_link"));
rewardCoupon.getJumpDetail().setNeedLogin(true);
@@ -629,7 +631,9 @@
goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
goodsDetail.getMoneyInfo()
.setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPShareRate()));
+ goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
}
+ goodsDetail.getMoneyInfo().setRateInfoHelpUrl(configService.get("goods_detail_fanli_rate_help_url"));
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
@@ -651,11 +655,9 @@
hongBaoManageService.getFanLiRate());
otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
// 浣跨敤濂栧姳鍒告渶楂樿繑
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
maxMoneyPlus = "锛堜含涓減lus杩斅�"
- + JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
- hongBaoManageService.getVIPFanLiRate())
- + "锛�";
+ + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getVIPFanLiRate()) + "锛�";
} else
maxMoneyPlus = "锛堜含涓減lus鏈�楂樿繑楼"
+ fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
@@ -669,13 +671,13 @@
rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1 = new JSONObject();
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.get("special_guide_reward_coupon_link"));
else
params1.put("url", configService.get("vip_link"));
rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
rewardCoupon.setDesc("杩�");
params1.put("url", configService.get("vip_link"));
rewardCoupon.getJumpDetail().setNeedLogin(true);
@@ -825,20 +827,22 @@
goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
goodsDetail.getMoneyInfo().setShareMoney(
"楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPShareRate()));
+ goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
}
+ goodsDetail.getMoneyInfo().setRateInfoHelpUrl(configService.get("goods_detail_fanli_rate_help_url"));
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1 = new JSONObject();
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.get("special_guide_reward_coupon_link"));
else
params1.put("url", configService.get("vip_link"));
rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
rewardCoupon.setDesc("杩�");
params1.put("url", configService.get("vip_link"));
rewardCoupon.getJumpDetail().setNeedLogin(true);
--
Gitblit v1.8.0