From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 11:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
index d38f6b8..ab1a5d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
@@ -294,8 +294,8 @@
}
try {
- UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType);
- JSONObject data = commonOrderService.getRewardJumpInfo(orderNo);
+ UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType, acceptData);
+ JSONObject data = commonOrderService.getRewardJumpInfo(orderNo, goodsType);
out.print(JsonUtil.loadTrueResult(data));
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
--
Gitblit v1.8.0