From 35a0e0c8e70287765a828683f7fdebfb35908559 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 十一月 2019 14:15:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
index f9acd8b..5dfaaf7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -418,6 +418,8 @@
out.print(JsonUtil.loadFalseResult(1, "绾㈠寘宸茶鎶㈠厜"));
return;
}
+ winDetail.setLogo(Constant.systemCommonConfig.getDefaultPortrait());
+ winDetail.setLogoLight(Constant.systemCommonConfig.getDefaultPortrait());
JSONObject params = new JSONObject();
params.put("url", redPackConfigService.getValueByKey("goods_shop_link_h5"));
@@ -427,7 +429,7 @@
winDetail.setTips(redPackConfigService.getValueByKey("new_user_win_tips"));
// 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");
+ List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("redpack_win_detail_banner");
List<SwiperPicture> topPicList = new ArrayList<>();
if (oldtopPicList != null && oldtopPicList.size() > 0)
topPicList.addAll(oldtopPicList);
--
Gitblit v1.8.0