From 8c66e480d8a3c129a9032a90d39688e875f45ee5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 14:50:02 +0800
Subject: [PATCH] 奖励订单到账逻辑添加

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 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 d52211c..8b245fd 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
@@ -2214,4 +2214,52 @@
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 
+	
+	/**
+	 *  娲诲姩鍒楄〃
+	 * 
+	 * @param acceptData
+	 * @param out
+	 */
+	@RequestMapping(value = "getSpecialActivities")
+	public void getSpecialActivities(AcceptData acceptData, PrintWriter out) {
+
+		System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		if (system == null) {
+			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+			return;
+		}
+		
+		try {
+			// 涓撻娲诲姩
+			String specialCard = "special_activities";
+			
+			List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, 
+					specialCard, system.getId());
+
+			if (listSpecial != null && listSpecial.size() > 0) {
+				for (Special special : listSpecial) {
+					special.setCreatetime(null);
+					special.setUpdatetime(null);
+					special.setState(null);
+					special.setRemark(null);
+					special.setCard(null);
+					special.setCardId(null);
+					
+					JumpDetailV2 jumpDetail = special.getJumpDetail();
+					if (jumpDetail != null) {
+						jumpDetail.setId(null);
+						jumpDetail.setName(null);
+					}
+				}
+			}
+
+			JSONObject root = new JSONObject();
+			root.put("special", listSpecial);
+
+			out.print(JsonUtil.loadTrueResult(root));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }

--
Gitblit v1.8.0