From 8b505f74e1094fd67f86373ab9e9f80b54bca54e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 11 十月 2019 12:12:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 5fe344d..2164966 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
@@ -545,9 +545,9 @@
} else {// 鏅�氳喘涔�
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1=new JSONObject();
- params1.put("balanceMore", true);
+ params1.put("url", configService.get("special_guide_reward_coupon_link"));
rewardCoupon.setParams(params1.toString());
rewardCoupon.setMaxMoney("楼" +TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate).add( MoneyBigDecimalUtil.mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate),
Constant.MAX_REWARD_RATE)));
@@ -660,9 +660,9 @@
// 濂栧姳鍒歌繑鍒�
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1=new JSONObject();
- params1.put("balanceMore", true);
+ params1.put("url", configService.get("special_guide_reward_coupon_link"));
rewardCoupon.setParams(params1.toString());
rewardCoupon.setMaxMoney(
"楼" +JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate).add( MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE)));
@@ -808,9 +808,9 @@
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params1=new JSONObject();
- params1.put("balanceMore", true);
+ params1.put("url", configService.get("special_guide_reward_coupon_link"));
rewardCoupon.setParams(params1.toString());
rewardCoupon.setMaxMoney("楼" +PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate).add(MoneyBigDecimalUtil.mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate),
Constant.MAX_REWARD_RATE)));
--
Gitblit v1.8.0