From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 31be50f..fe3032d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2237,9 +2237,9 @@
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
- data.put("userHongbao", new BigDecimal(0).setScale(2));
+ data.put("userHongbao", new BigDecimal(0).setScale(2).toString());
} else {
- data.put("userHongbao", userMoneyExtra.getTlj().setScale(2));
+ data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());
}
noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");
@@ -2491,7 +2491,8 @@
list.addAll(listSpecial);
}
- for (Special special: list) {
+ for (int i = 0; i < list.size(); i++) {
+ Special special = list.get(i);
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
@@ -2508,7 +2509,8 @@
// 鏄惁闇�瑕佸脊鍑烘
if (name.equals("璐︽埛绛夌骇鐗规潈")) {
if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
- list.remove(special);
+ list.remove(i);
+ i--;
} else {
if (uid != null) {
special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
--
Gitblit v1.8.0