From f94a5a1d3fe9bde0e599d41f2d97caea1b08a88d Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 29 六月 2020 15:48:12 +0800 Subject: [PATCH] 免单调整 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 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 c878760..23107a4 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 @@ -67,14 +67,6 @@ */ public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception; - /** - * 鏌ヨ鍟嗗搧浣跨敤鐩稿叧鍒� - * @param uid - * @return - * @throws UserSystemCouponException - * @throws Exception - */ - public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception; /** * 鏇存柊鍒镐娇鐢ㄨ褰� @@ -146,23 +138,21 @@ * @return 鍏嶅崟鎴愬姛 true * @throws Exception */ - public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId) throws Exception; + public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, + Long auctionId , Integer sourceType) throws Exception; /** * 璁㈠崟閫�娆炬洿鏂� 鍒歌褰曠姸鎬佸苟閫�鍥炲埜 * @param orderNo */ - public void updateStateByDrawback(String orderNo) throws Exception; + public void updateStateByDrawback(String orderNo, Integer sourceType) throws Exception; /** * 绾㈠寘鍒拌处 -- 鏇存柊鍒镐娇鐢ㄧ姸鎬� -鏀逛负浣跨敤鎴愬姛 * @param orderNo * @throws Exception */ - public void updateStateByArrivalAccount(String orderNo) throws Exception; - - - + public void updateStateByArrivalAccount(String orderNo, Integer sourceType) throws Exception; /** * 缁熻浠婃棩鎶藉涓殑鍒告暟閲� @@ -324,4 +314,28 @@ public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify, BigDecimal percent) throws UserSystemCouponException, Exception; + /** + * 鍏嶅崟鍒歌幏寰� + * @param uid + * @param typeEnum + * @param source + * @param num + * @param notify + * @param expiryDay + * @return + * @throws UserSystemCouponException + * @throws Exception + */ + public UserSystemCoupon freeCouponWinBySystem(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify, + Integer expiryDay) throws UserSystemCouponException, Exception; + + /** + * 鑾峰彇鏈夋晥鍏嶅崟鍒稿垪琛� + * @param uid + * @return + */ + public List<UserSystemCouponVO> getFreeCouponList(Long uid); + + public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception; + } -- Gitblit v1.8.0