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/dao/mybatis/user/UserSystemCouponRecordMapper.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java
index 268ff31..1db8e71 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java
@@ -25,7 +25,7 @@
* @param listCouponId
* @return
*/
- UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("state") Integer state);
+ UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("source")Integer source, @Param("state") Integer state);
/**
@@ -39,11 +39,9 @@
/**
- * 鏌ヨ姝ｅ湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰�
- * @param uid
- * @param seconds
+ * 鏌ヨ鏈�杩戜娇鐢ㄨ褰�
+ * @param userCouponId
* @return
*/
- List<UserSystemCouponRecord> getCouponByUsingTimeOut(@Param("uid") Long uid, @Param("number") Long number);
-
+ UserSystemCouponRecord getNearByUserCouponId(@Param("userCouponId") Long userCouponId);
}
\ No newline at end of file
--
Gitblit v1.8.0