From a70d35cd9a672deb0aed272c8209ddde096f917b Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 12 十二月 2018 10:25:08 +0800
Subject: [PATCH] 动态商品分享接口修改,添加新接口, 画图调整

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java |   52 ++++++++++++++--------------------------------------
 1 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
index 85c3359..1739ff9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -4,12 +4,14 @@
 
 import javax.annotation.Resource;
 
+import net.sf.json.JSONObject;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.yeshi.utils.JsonUtil;
 
-import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
 
 @Controller
 @RequestMapping("api/apph5/v1/share")
@@ -19,61 +21,35 @@
 	@Resource
 	private UserShareGoodsGroupService userShareGoodsGroupService;
 	
+	@Resource
+	private UserShareGoodsRecordService userShareGoodsRecordService;
+	
 	/**
-	 * 鍒嗕韩鍟嗗搧
+	 * 鍒嗕韩鍟嗗搧璇︽儏
 	 * @param callback
 	 * @param shareId  鍒嗕韩id
 	 * @param source   鏉ユ簮
 	 * @param out
 	 */
 	@RequestMapping(value = "getDetail")
-	public void getDetail(String callback, Long shareId, String source, PrintWriter out) {
+	public void getDetail(String callback, Long shareId, String source, String fingerprint, PrintWriter out) {
 		
 		try {
 			
 			if (shareId == null) {
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝g‘")));
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝g‘"));
 				return;
 			}
-			
+			// 鏇存柊璁块棶娆℃暟
 			userShareGoodsGroupService.updateBrowseRecord(shareId, 1);
+			// 鑾峰彇鍟嗗搧淇℃伅
+			JSONObject data = userShareGoodsRecordService.getGoodsGroup(shareId);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 			
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鏇存柊鎴愬姛")));
-		} catch (UserShareGoodsRecordException e) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));
 		} catch (Exception e) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏇存柊澶辫触")));
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
 			e.printStackTrace();
 		}
 	}
-	
-	/**
-	 * 鍒嗕韩鍟嗗搧
-	 * @param callback
-	 * @param shareId  鍒嗕韩id
-	 * @param source   鏉ユ簮
-	 * @param out
-	 */
-	@RequestMapping(value = "record")
-	public void query(String callback, Long shareId, String source, PrintWriter out) {
-		
-		try {
-			
-			if (shareId == null) {
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝g‘")));
-				return;
-			}
-			
-			userShareGoodsGroupService.updateBrowseRecord(shareId, 1);
-			
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鏇存柊鎴愬姛")));
-		} catch (UserShareGoodsRecordException e) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));
-		} catch (Exception e) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏇存柊澶辫触")));
-			e.printStackTrace();
-		}
-	}
-	
 	
 }

--
Gitblit v1.8.0