From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 18 一月 2020 12:06:27 +0800 Subject: [PATCH] 用户注册信息 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 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 deb4f71..3d4857d 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,6 +3,7 @@ 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; @@ -91,7 +92,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception; + public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData) throws UserSystemCouponException, Exception; /** * 鏍规嵁璁㈠崟鍙疯幏鍙栧鍔卞埜浣跨敤杩涘害 @@ -237,7 +238,7 @@ * @throws UserSystemCouponException * @throws Exception */ - public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid) throws UserSystemCouponException, Exception; + public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid) throws UserSystemCouponException, Exception; /** @@ -270,18 +271,12 @@ public void updateCounponInvalid(List<UserSystemCoupon> list); /** - * 鍏戞崲 + * 鏈夋晥濂栧姳鍒� * @param uid * @return */ - public boolean getIncludeExchange(Long uid); + public boolean getValidRebateCoupon(Long uid); - /** - * 闈炲厬鎹� - * @param uid - * @return - */ - public boolean getIncludeNotExchange(Long uid); /** * 鏌ヨ1.6.5涔嬪墠鐨� 涓嶇瓑浜�35% @@ -325,4 +320,23 @@ */ 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); + } -- Gitblit v1.8.0