From dc73adfa9d92d11d1a8512778deacc34fa877eef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 14:41:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 b753ef5..edaa733 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
@@ -138,6 +138,24 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
}
}
+
+ /**
+ * 鍒嗕韩鍟嗗搧
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "sharegoodsv2", method = RequestMethod.POST)
+ public void shareGoodsV2(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
+ try {
+ JSONObject data = activityService.shareGoodsV2(uid, activityId);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (ActivityException e) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
+ e.printStackTrace();
+ }
+ }
/**
* 鍒嗕韩鍟嗗搧锛堜即闅忓浘鐗囩殑MD5锛�
--
Gitblit v1.8.0