From 8f45af9d6cdae97f4f265d2f2a123d990cf1bb1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 06 五月 2019 17:57:07 +0800
Subject: [PATCH] 设备未读消息处理,分类BUG修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index f78c111..1d2e782 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -28,6 +28,7 @@
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.ActivityException;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
@@ -114,7 +115,7 @@
 	@RequestMapping(value = "testactivity")
 	public void test2(PrintWriter out) {
 		List<RecommendActivity> list = activityService.getRecommendActivityList(1, Constant.PAGE_SIZE);
-		long count = activityService.getRecommendActivityCount();
+		long count = activityService.getRecommendActivityCount(null);
 		JSONObject data = new JSONObject();
 		data.put("data", getGson().toJson(list));
 		data.put("count", count);
@@ -126,6 +127,8 @@
 		try {
 			ActivityShareResult result = activityService.shareActivityGoods(343448L, 1L);
 			out.print(JsonUtil.getSimpleGson().toJson(result));
+		} catch (UserShareGoodsRecordException e) {
+			e.printStackTrace();
 		} catch (ActivityException e) {
 			e.printStackTrace();
 		}
@@ -169,4 +172,10 @@
 			e.printStackTrace();
 		}
 	}
+	
+	@RequestMapping(value = "testhtml")
+	public void testhtml(PrintWriter out) {
+		out.print("<script>yestv.finishPage();</script>");
+		out.close();
+	}
 }

--
Gitblit v1.8.0