From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 14 十月 2019 17:44:13 +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 | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 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 af891a1..deb4f71 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 UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception; + public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,Boolean needNotify) throws UserSystemCouponException, Exception; /** @@ -200,6 +200,22 @@ * @throws Exception */ public void randomRewardCoupon(int num, Long uid, String source) throws Exception; + + + + + /** + * 绯荤粺璧犻�佸鍔卞埜 + * @param num + * @param uid + * @param source + * @throws Exception + */ + public void systemGiveRewardCoupon(Long uid,int num,String orderId,Integer orderType,String reason) throws Exception; + + + + /** * 娣诲姞鍒� @@ -287,4 +303,26 @@ */ public void sendBackGiveUser(Long uid); + /** + * 缁熻鍙娇鐢ㄧ殑鍏嶅崟鍒� + * @param uid + * @return + */ + public long countUsableFreeCouponForBuy(Long uid); + + /** + * 缁熻鍙娇鐢ㄧ殑濂栧姳鍒� + * @param uid + * @return + */ + public long countUsableRewardCoupon(Long uid); + + /** + * 鏌ヨ鍏嶅埜鏁伴噺 + * @param uid + * @param type + * @return + */ + public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type); + } -- Gitblit v1.8.0