From 073d2e0dd261bae87d8f26092988dc176c940eaa Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:29 +0800
Subject: [PATCH] 券相关的通知消息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 8b245fd..55654a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -102,6 +102,7 @@
 import com.yeshi.fanli.service.inter.user.TBPidService;
 import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
 import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
@@ -233,6 +234,9 @@
 
 	@Resource
 	private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
+	
+	@Resource
+	private UserInfoExtraService userInfoExtraService;
 
 	@RequestMapping(value = "getrecommendsection")
 	public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -2214,9 +2218,8 @@
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 
-	
 	/**
-	 *  娲诲姩鍒楄〃
+	 * 娲诲姩鍒楄〃
 	 * 
 	 * @param acceptData
 	 * @param out
@@ -2229,13 +2232,13 @@
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;
 		}
-		
+
 		try {
 			// 涓撻娲诲姩
 			String specialCard = "special_activities";
-			
-			List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, 
-					specialCard, system.getId());
+
+			List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
+					system.getId());
 
 			if (listSpecial != null && listSpecial.size() > 0) {
 				for (Special special : listSpecial) {
@@ -2245,12 +2248,19 @@
 					special.setRemark(null);
 					special.setCard(null);
 					special.setCardId(null);
-					
+
+					// 鎵嬪姩鏇挎崲鍙傛暟
+					if (special.getName() != null && special.getName().contains("閭�璇�")) {
+//						userInfoExtraService
+
+					}
+
 					JumpDetailV2 jumpDetail = special.getJumpDetail();
 					if (jumpDetail != null) {
 						jumpDetail.setId(null);
 						jumpDetail.setName(null);
 					}
+
 				}
 			}
 

--
Gitblit v1.8.0