From 4e6b74661dd3e622e5d4ef5e244efd306408c983 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 12 十二月 2018 17:40:57 +0800
Subject: [PATCH] Merge branch 'dev1'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index 3fab29c..cd5cc62 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -188,7 +188,7 @@
 		}
 
 	}
-
+	
 	/**
 	 * 鍒嗕韩璁板綍缁熻鍒楄〃
 	 * 
@@ -291,4 +291,54 @@
 		}
 	}
 
+	
+	
+	/**
+	 * 鍟嗗搧璇︽儏鍒嗕韩
+	 * @param acceptData
+	 * @param uid  鐢ㄦ埛id
+	 * @param auctionId  鍟嗗搧id
+	 * @param type 鍥剧墖鍒嗕韩绫诲瀷  鍗曞浘single 澶氬浘many 
+	 * @param out
+	 */
+	@RequestMapping(value = "sharedetail", method = RequestMethod.POST)
+	public void shareDetail(AcceptData acceptData, Long uid, Long auctionId, String type, PrintWriter out) {
+		try {
+			userShareGoodsRecordService.saveDetail(uid, auctionId, type);
+			out.print(JsonUtil.loadTrueResult("鍒嗕韩鎴愬姛"));
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getMsg()));
+			e.printStackTrace();
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
+			e.printStackTrace();
+		}
+	}
+	
+	
+	/**
+	 * 鏇存柊鍒嗕韩璁板綍
+	 * @param acceptData
+	 * @param shareId
+	 * @param out
+	 */
+	@RequestMapping(value = "updaterecord", method = RequestMethod.POST)
+	public void updateRecord(AcceptData acceptData, Long shareId, PrintWriter out) {
+		if (shareId == null) {
+			out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�"));
+		}
+		
+		try {
+			userShareGoodsRecordService.updateShareRecord(shareId);
+			out.print(JsonUtil.loadTrueResult(""));
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getMsg()));
+			e.printStackTrace();
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
+	
 }

--
Gitblit v1.8.0