From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 23 五月 2020 09:54:38 +0800 Subject: [PATCH] 足迹、收藏订单兼容新需求 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java | 197 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 172 insertions(+), 25 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 ca545de..c878760 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 @@ -3,8 +3,11 @@ import java.math.BigDecimal; import java.util.List; +import com.yeshi.fanli.entity.accept.AcceptData; 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; @@ -35,7 +38,7 @@ * @param uid * @return */ - public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid) throws UserSystemCouponException, Exception; + public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump ) throws UserSystemCouponException, Exception; /** * 缁熻鏁伴噺 @@ -71,7 +74,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception; + public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception; /** * 鏇存柊鍒镐娇鐢ㄨ褰� @@ -80,7 +83,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception; + public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception; /** @@ -90,7 +93,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception; + public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData) throws UserSystemCouponException, Exception; /** * 鏍规嵁璁㈠崟鍙疯幏鍙栧鍔卞埜浣跨敤杩涘害 @@ -99,7 +102,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception; + public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception; /** * 鏄惁瀛樺湪濂栧姳鍒� @@ -115,7 +118,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception; + public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception; /** * 鏍规嵁璁㈠崟鏉ユ簮鏌ヨ @@ -125,21 +128,7 @@ */ public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source); - /** - * 鎻掑叆鍒镐俊鎭� - * @param uid - * @param couponType - * @param source 鏉ユ簮 - * @throws UserSystemCouponException - * @throws Exception - */ - public void insertUserCoupon(Long uid, String couponType, String source) throws UserSystemCouponException, Exception; - /** - * 鍒稿凡杩囨湡鏇存柊 - * @param uid - */ - public void updateCounponInvalid(Long uid); /** * 閫�鍥炲埜 @@ -147,11 +136,6 @@ */ public void sendBackTimeOutCoupon(Long uid); - /** - * 婵�娲荤鍒╁厤鍗曞埜 - * @param uid - */ - public void activatedWelfareFreeCoupon(Long uid); /** * 鏇存柊鍒歌褰� 鈥斺�斿尮閰嶅厤鍗曞埜 @@ -176,5 +160,168 @@ * @throws Exception */ public void updateStateByArrivalAccount(String orderNo) throws Exception; + + + + /** + * 缁熻浠婃棩鎶藉涓殑鍒告暟閲� + * @param uid + * @param source + * @return + */ + public int countTodatyUserCouponBySource(Long uid, String source); + + + + /** + * 娣诲姞鍒� + * @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 + * @param start + * @param count + * @param uid + * @return + * @throws UserSystemCouponException + * @throws Exception + */ + public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid) throws UserSystemCouponException, Exception; + + + /** + * 璧犻�佸埜鐢熸垚鍙ｄ护 + * @param uid + * @param id + * @return + * @throws UserSystemCouponException + */ + public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException; + + + /** + * 璧犻�侀��鍥� + * @param id + */ + public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList); + + /** + * 鏌ヨ闇�瑕佽繃鏈熺殑 + * @param count + * @return + */ + public List<UserSystemCoupon> getCounponNowInvalid(int count); + + /** + * 杩囨湡鍒� + * @param list + */ + public void updateCounponInvalid(List<UserSystemCoupon> list); + + /** + * 鏈夋晥濂栧姳鍒� + * @param uid + * @return + */ + public boolean getValidRebateCoupon(Long uid); + + + /** + * 鏌ヨ1.6.5涔嬪墠鐨� 涓嶇瓑浜�35% + * @param uid + * @return + */ + public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception; + + public long countCouponOld(Long uid); + + /** + * 鏇存柊鐢ㄦ埛杩囨湡鍒� + * @param uid + */ + public void updateInvalidSate(Long uid); + + /* + * 璧犻�佸埜 + */ + 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); + + /** + * 婵�娲诲厤鍗曞埜---璁㈠崟宸插埌璐� 瑙﹀彂婵�娲诲厤鍗曞埜 + * @param uid + */ + public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source); + + /** + * 閫�鍥炲埜 + * @param giveid + */ + public void sendBackByGiveId(Long giveid); + + /** + * 缁熻璧犻�佸厤鍗曞埜 + * @param uid + * @return + */ + 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; + } -- Gitblit v1.8.0