From b16f2b0126281e87346db9e6efd1db960ecc872a Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 15 三月 2020 21:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponGiveRecordService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponGiveRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponGiveRecordService.java
index 0d8b6ba..95cca83 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponGiveRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponGiveRecordService.java
@@ -54,6 +54,27 @@
 	 * @param count
 	 * @return
 	 */
-	UserSystemCouponGiveRecord getByReceiveId(Long receiveId);
+	public UserSystemCouponGiveRecord getByReceiveId(Long receiveId);
+	
+	/**
+	 * 鏌ヨ鍒歌禒閫佷俊鎭�
+	 * @param couponId
+	 * @return
+	 */
+	public UserSystemCouponGiveRecord getByCouponId(Long couponId);
+
+
+	
+	/**
+	 * 鏌ヨ璧犻�佽褰�
+	 * @param start
+	 * @param count
+	 * @param type
+	 * @param state
+	 * @return
+	 */
+	public List<UserSystemCouponGiveRecord> listGiveRecord(long start, int count, String type, Integer state);
+
+	public long countGiveRecord(String type, Integer state);
 
 }

--
Gitblit v1.8.0