From 28cd97d04c68bd8c5fd4adf7780200f61da13654 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 20 九月 2019 14:39:36 +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/v1/UserCouponController.java | 2 +-
1 files changed, 1 insertions(+), 1 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..239c77d 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
@@ -295,7 +295,7 @@
try {
UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType);
- JSONObject data = commonOrderService.getRewardJumpInfo(orderNo);
+ 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