From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 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 f9a0354..d5f0803 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
@@ -14,8 +14,34 @@
 
 	public int updateByPrimaryKey(UserSystemCouponRecord record);
 
-	public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state);
+	public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer source, Integer state);
 
-	public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list);
+	public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list);
+
+
+	/**
+	 * 鏌ヨ鐘舵��
+	 * 
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	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