From b90c2f738f64df608ae9f9277c7a3ab35c46498a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 八月 2019 16:27:32 +0800
Subject: [PATCH] 金币获得事件上传

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 e994e79..302b704 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
@@ -29,6 +29,7 @@
 import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
 import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;
 import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
@@ -48,7 +49,9 @@
 @RequestMapping("api/v2/commoncontent")
 public class CommonContentControllerV2 {
 
-
+	@Resource
+	private SwiperPictureService swiperPictureService;
+	
 	@Resource
 	private HongBaoManageService hongBaoManageService;
 
@@ -211,7 +214,16 @@
 	public void getListPDD(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
 		JSONObject data = new JSONObject();
 		if (page == 1) {
-			List<SwiperPicture> bannerList = new ArrayList<>();
+			// 2銆侀《閮ㄨ疆鎾浘
+			List<SwiperPicture> bannerList = null;
+			if (Constant.IS_TEST) {
+				bannerList = swiperPictureService.getByBannerCard("index_top");
+			}	
+			
+			if (bannerList == null) {
+				bannerList = new ArrayList<SwiperPicture>();
+			}
+
 			data.put("bannerList", new Gson().toJson(bannerList));
 		}
 		

--
Gitblit v1.8.0