From f47a3671ad4a5b7c11c93585c92b9677ce06c266 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 12 十二月 2018 17:39:58 +0800
Subject: [PATCH] 分享商品优化(商品详情+动态+选品库)

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java
index edaa733..7580e1a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java
@@ -8,10 +8,15 @@
 
 import javax.annotation.Resource;
 
+import net.sf.json.JSONObject;
+
 import org.jsoup.Jsoup;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.entity.FileUploadResult;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -22,14 +27,10 @@
 import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
 import com.yeshi.fanli.exception.ActivityException;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
-import org.yeshi.utils.entity.FileUploadResult;
-
-import net.sf.json.JSONObject;
 
 /**
  * 鍔ㄦ��
@@ -134,6 +135,9 @@
 				imgList.add(uploadResult.getUrl());
 			data.put("shareImgs", imgList);
 			out.print(JsonUtil.loadTrueResult(data));
+			
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
 		} catch (ActivityException e) {
 			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
 		}
@@ -151,6 +155,8 @@
 		try {
 			JSONObject data = activityService.shareGoodsV2(uid, activityId);
 			out.print(JsonUtil.loadTrueResult(data));
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
 		} catch (ActivityException e) {
 			out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
 			e.printStackTrace();
@@ -173,6 +179,8 @@
 			data.put("shareTitle", result.getTitle());
 			data.put("shareImgs", result.getImgList());
 			out.print(JsonUtil.loadTrueResult(data));
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
 		} catch (ActivityException e) {
 			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
 		}

--
Gitblit v1.8.0