From 11c098089f8c4714188e91032e5a19e8fe94bf96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 22 八月 2019 09:26:52 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
index 84ed469..917ecb9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
@@ -121,29 +121,29 @@
}
+ /**
+ * 璧犻�佸埜鍙ｄ护鐢熸垚
+ * @param acceptData
+ * @param uid
+ * @param id
+ * @param out
+ */
@RequestMapping(value = "giveCoupon", method = RequestMethod.POST)
public void giveCoupon(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
if (id == null || id <= 0) {
out.print(JsonUtil.loadFalseResult(1, "浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
-
-
try {
String tips = UserSystemCouponService.giveCoupon(uid, id);
out.print(JsonUtil.loadTrueResult(tips));
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
-
-
-
-
}
}
--
Gitblit v1.8.0