From 1823108940bb5fda2d26787236dc5df3004bc0ec Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 10:41:30 +0800
Subject: [PATCH] Merge branch 'dev_2'
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java
index 7df020a..06dcad4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java
@@ -12,8 +12,6 @@
public interface ExtractService {
- public List<Extract> getExtractInfoByUid(long uid);
-
/**
* 鎻愮幇鐢宠
*
@@ -21,10 +19,8 @@
* @return 杩斿洖濡傛灉涓簄ull锛屽垯鎻愮幇鐢宠鎻愪氦鎴愬姛銆傚鏋滀负1锟�?锛屽凡瓒呰繃褰撴棩鎻愮幇娆℃暟鎴栨彁鐜伴噾棰濓紒濡傛灉锟�?锛屾彁鐜伴噾棰濆ぇ浜庢垜鐨勭孩鍖咃紒
*/
public Integer addExtract(Extract extract);
-
- public List<Extract> getExtractList(int i);
-
- public int getCount();
+
+// public int getCount();
/**
* 閫氳繃
@@ -42,7 +38,7 @@
* @throws ObjectStateException
* @throws NotExistObjectException
*/
- public void rejectExtract(long id, String reason, long extractTime, AdminUser adminUser)
+ public void rejectExtract(long id, String reason, AdminUser adminUser)
throws ObjectStateException, NotExistObjectException;
/**
@@ -61,7 +57,7 @@
* @param uid
* @return
*/
- public void checkExtract(String uid) throws ExtractException ;
+ public void checkExtract(Long uid) throws ExtractException ;
public Extract selectByPrimaryKey(Long id);
@@ -98,5 +94,7 @@
* @return
*/
public double countTodayMoney(Long uid);
+
+
}
--
Gitblit v1.8.0