From e04f81915e100107eca5fe16ba44898f3a0dbd55 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:48:06 +0800
Subject: [PATCH] redis指定数据库

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index f01d507..244f670 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -40,6 +40,7 @@
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -240,14 +241,14 @@
 		JSONObject data = new JSONObject();
 		if (page == 1) {
 			// 2銆侀《閮ㄨ疆鎾浘
-			List<SwiperPicture> bannerList = null;
+			List<BannerVO> bannerList = null;
 			if (Constant.IS_TEST) {
 				bannerList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(),
-						Integer.parseInt(acceptData.getVersion()));
+						Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
 			}
 
 			if (bannerList == null) {
-				bannerList = new ArrayList<SwiperPicture>();
+				bannerList = new ArrayList<BannerVO>();
 			}
 
 			data.put("bannerList", new Gson().toJson(bannerList));

--
Gitblit v1.8.0