From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 14 七月 2020 12:36:48 +0800 Subject: [PATCH] 系统区分BUG修复 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java | 129 +++++++++++++++++++----------------------- 1 files changed, 58 insertions(+), 71 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 3d4857d..8e25c87 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 @@ -7,6 +7,7 @@ import com.yeshi.fanli.entity.bus.user.UserSystemCoupon; import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord; import com.yeshi.fanli.entity.system.SystemCoupon; +import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.exception.user.UserSystemCouponException; import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO; import com.yeshi.fanli.vo.user.UserSystemCouponVO; @@ -66,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; /** * 鏇存柊鍒镐娇鐢ㄨ褰� @@ -127,15 +120,6 @@ */ public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source); - /** - * 鎻掑叆鍒镐俊鎭� - * @param uid - * @param couponType - * @param source 鏉ユ簮 - * @throws UserSystemCouponException - * @throws Exception - */ - public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,Boolean needNotify) throws UserSystemCouponException, Exception; /** @@ -144,11 +128,6 @@ */ public void sendBackTimeOutCoupon(Long uid); - /** - * 婵�娲荤鍒╁厤鍗曞埜 - * @param uid - */ - public void activatedWelfareFreeCoupon(Long uid, String from); /** * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜 @@ -159,31 +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; - - /** - * 棰嗗彇鏈櫥褰曟椂宸叉娊濂栫殑绀煎搧 - * @param uid - * @param platform - * @param device - * @throws Exception - */ - public void copyLotteryPrize(Long uid, int platform, String device) throws Exception; - - + public void updateStateByArrivalAccount(String orderNo, Integer sourceType) throws Exception; /** * 缁熻浠婃棩鎶藉涓殑鍒告暟閲� @@ -192,42 +161,7 @@ * @return */ public int countTodatyUserCouponBySource(Long uid, String source); - - /** - * 闅忔満鐢熸垚濂栧姳鍒� - * @param num - * @param uid - * @param source - * @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; - - - - - - /** - * 娣诲姞鍒� - * @param uid - * @param couponType - * @param source - * @throws UserSystemCouponException - */ - public void exchangeCoupon(Long uid, String couponType, String source, - BigDecimal percent) throws UserSystemCouponException, Exception; - /** * 鍒稿垪琛� 1.6.5 @@ -339,4 +273,57 @@ */ public long countGiveFreeCoupon(Long uid); + + /** + * 鍏嶅崟鍒歌幏寰� + * @param uid + * @param typeEnum 绫诲瀷 + * @param source 鏉ユ簮 + * @param num 鏁伴噺 + * @param notify 鏄惁鍙戦�佹秷鎭� + * @return + * @throws UserSystemCouponException + */ + public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify) + throws UserSystemCouponException, Exception; + + /** + * 濂栧姳鍒稿埜鑾峰緱 + * @param uid + * @param typeEnum + * @param source + * @param num + * @param notify + * @param percent + * @return + * @throws UserSystemCouponException + * @throws Exception + */ + 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, Integer activated) 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