From 659ecb86b75e24c95ab2edc9a056fdd6f7d90a91 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 23 八月 2019 11:09:28 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java index 521317e..9a24d68 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java @@ -134,7 +134,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public void insertUserCoupon(Long uid, String couponType, String source) throws UserSystemCouponException, Exception; + public void insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception; /** @@ -231,7 +231,7 @@ * @return * @throws UserSystemCouponException */ - public String giveCoupon(Long uid, Long id) throws UserSystemCouponException; + public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException; /** -- Gitblit v1.8.0