From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 10:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderService.java |   83 ++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderService.java
index 549ca13..90bcd13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderService.java
@@ -1,7 +1,7 @@
 package com.yeshi.fanli.service.inter.order.dividents;
 
+import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrder;
 import com.yeshi.fanli.exception.ParamsException;
@@ -17,56 +17,8 @@
 	 * void 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public void addTeamDividentsSourceOrder(TeamDividentsSourceOrder order) throws TeamDividentsSourceOrderException,ParamsException;
-
-	/**
-	 * 
-	 * @Title: listCanSendByUidAndPreSendTime
-	 * @Description: 
-	 * @param uid
-	 * @param preSendTime
-	 * @return 
-	 * List<TeamDividentsSourceOrder> 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public List<TeamDividentsSourceOrder> listCanSendByUidAndPreSendTime(Long uid, Date preSendTime, int page,
-			int pageSize);
-
-	/**
-	 * 
-	 * @Title: countCanSendByUidAndPreSendTime
-	 * @Description: 
-	 * @param uid
-	 * @param preSendTime
-	 * @return 
-	 * long 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public long countCanSendByUidAndPreSendTime(Long uid, Date preSendTime);
-
-	/**
-	 * 鑾峰彇鑳藉鍒嗙孩鐨勮鍗曟簮鐢ㄦ埛ID鍒楄〃
-	 * @Title: listCanSendUidByPreSendTime
-	 * @Description: 
-	 * @param preSendTime
-	 * @param page
-	 * @param count
-	 * @return 
-	 * List<Long> 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public List<Long> listCanSendUidByPreSendTime(Date preSendTime, int page, int count);
-
-	/**
-	 * 鑾峰彇鑳藉鍒嗙孩鐨勮鍗曟簮鐢ㄦ埛ID鏁伴噺
-	 * @Title: countCanSendUidByPreSendTime
-	 * @Description: 
-	 * @param preSendTime
-	 * @return 
-	 * Long 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public Long countCanSendUidByPreSendTime(Date preSendTime);
+	public TeamDividentsSourceOrder addTeamDividentsSourceOrder(TeamDividentsSourceOrder order)
+			throws TeamDividentsSourceOrderException, ParamsException;
 
 	/**
 	 * 鏍规嵁涓婚敭鏌ヨ
@@ -111,8 +63,7 @@
 	 * @throws
 	 */
 	public void send(Long id);
-	
-	
+
 	/**
 	 * 鏍规嵁璁㈠崟鏌ヨ
 	 * @Title: selectByOrderNoSourceType
@@ -123,6 +74,30 @@
 	 * TeamDividentsSourceOrder 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public TeamDividentsSourceOrder selectByOrderNoSourceType(String orderNo,int sourceType);
+	public TeamDividentsSourceOrder selectByOrderNoSourceType(String orderNo, int sourceType);
+
+	/**
+	 * 璁㈠崟缁撶畻
+	 * @Title: orderSettle
+	 * @Description: 
+	 * @param orderNo
+	 * @param sourceType
+	 * @param income 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void orderSettle(String orderNo, int sourceType,Date preSendTime, BigDecimal income);
+
+	/**
+	 * 鏇存柊璧勯噾
+	 * @Title: updateMoney
+	 * @Description: 
+	 * @param orderNo
+	 * @param sourceType
+	 * @param money 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void updateMoney(String orderNo, int sourceType, BigDecimal money);
 
 }

--
Gitblit v1.8.0