From f00114371d8d379da18bc7fed3541b2575edea56 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 15:17:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 9e8c2ac..9b29dea 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
@@ -161,8 +161,10 @@
return;
}
try {
- String tips = UserSystemCouponService.giveCoupon(uid, id);
- out.print(JsonUtil.loadTrueResult(tips));
+ UserSystemCouponVO vo = UserSystemCouponService.giveCoupon(uid, id);
+ JSONObject data = new JSONObject();
+ data.put("result", JsonUtil.getApiCommonGson().toJson(vo));
+ out.print(JsonUtil.loadTrueResult(data));
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
--
Gitblit v1.8.0