From e068c9acf06cff7673fadfca686128f6d6d66e20 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 12 八月 2019 11:12:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 182fc89..4778aa3 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
@@ -13,8 +13,6 @@
public interface ExtractService {
- public List<Extract> getExtractInfoByUid(long uid);
-
/**
* 鎻愮幇鐢宠
*
@@ -23,9 +21,7 @@
*/
public Integer addExtract(Extract extract);
- public List<Extract> getExtractList(int i);
-
- public int getCount();
+ // public int getCount();
/**
* 閫氳繃
@@ -43,7 +39,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;
/**
@@ -62,7 +58,7 @@
* @param uid
* @return
*/
- public void checkExtract(String uid) throws ExtractException ;
+ public void checkExtract(Long uid) throws ExtractException;
public Extract selectByPrimaryKey(Long id);
@@ -89,10 +85,16 @@
* @param info
*/
public void processExtractResult(AlipayTransferResultInfo info);
-
-
+
public void testExtractSuccess(Long id);
-
+ /**
+ * 缁熻褰撴棩鎻愮幇
+ *
+ * @param uid
+ * @param day yyyy-MM-dd
+ * @return
+ */
+ public BigDecimal sumTodayApplyMoney(Long uid, String day);
}
--
Gitblit v1.8.0