From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 12 五月 2020 20:19:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java index 783dc95..4548621 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java @@ -16,14 +16,32 @@ public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state); - public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list); + public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list); + /** - * 鏌ヨ姝e湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰� + * 鏌ヨ鐘舵�� + * * @param uid - * @param seconds + * @param state * @return */ - public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds); + public List<UserSystemCouponRecord> getRecordByState(Long uid, Integer state); + + /** + * 璁㈠崟鍙锋槸鍚︽垚鍔熷厤鍗� + * + * @param orderId + * @return + */ + public boolean isSuccessMianDan(Integer source, String orderId); + + /** + * 鏌ヨ鏈�杩戣褰� + * @param userCouponId + * @return + */ + public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId); + } -- Gitblit v1.8.0