From 6fb64247b9f4a74c386c06251fb678dfa9f48ada Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 十二月 2019 10:31:18 +0800
Subject: [PATCH] 版本修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..b265eec 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
@@ -532,12 +532,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);
@@ -651,7 +651,7 @@
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())
@@ -669,13 +669,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);
@@ -832,13 +832,13 @@
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