From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderTeamRewardService.java |   80 +++++++++++++++++++++++++++++++++++----
 1 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderTeamRewardService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderTeamRewardService.java
index fdb6bdd..37ba00e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderTeamRewardService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderTeamRewardService.java
@@ -1,7 +1,10 @@
 package com.yeshi.fanli.service.inter.order;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
+import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
 import com.yeshi.fanli.entity.order.OrderTeamReward;
 import com.yeshi.fanli.exception.order.OrderTeamRewardException;
 
@@ -25,8 +28,6 @@
 	 * @return
 	 */
 	public OrderTeamReward getByOrderNoAndTypeForUpdate(Long uid, String orderNo, Integer type);
-	
-	
 
 	/**
 	 * 娣诲姞鎴栦慨鏀癸紙鎸夌収璁㈠崟鍙蜂笌鏉ユ簮锛�
@@ -34,7 +35,8 @@
 	 * @param orderId
 	 * @param sourceType
 	 */
-	public void addOrUpdateByOrder(String orderId, int sourceType) throws OrderTeamRewardException;
+	public void addOrUpdate(InviteOrderSubsidy subsidy, BigDecimal money, Long uid,int level)
+			throws OrderTeamRewardException;
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙蜂笌鏉ユ簮鏌ヨ
@@ -51,21 +53,81 @@
 	 * @param orderId
 	 * @param sourceType
 	 */
-	public void invalidByOrderIdAndSourceType(String orderId, int sourceType);
+	public void invalidByOrderIdAndSourceType(Long subsidyId);
 
-	
 	/**
 	 * 浣胯鍗曞彿瀵瑰簲鐨勬暟鎹湁鏁�
 	 * @param orderId
 	 * @param sourceType
 	 */
-	public void validByOrderIdAndSourceType(String orderId, int sourceType);
-	
-	
+	public void validByOrderIdAndSourceType(Long subsidyId,Date preGetTime);
+
 	/**
 	 * 缁撶畻閲戦
 	 * @param id
 	 * @param money
 	 */
-	public void settleById(Long id,BigDecimal money);
+	public void settleById(Long id, BigDecimal money);
+	
+	/**
+	 * 鏍规嵁琛ヨ创ID鑾峰彇鍥㈤槦濂栧姳
+	 * @Title: listBySubsidyId
+	 * @Description: 
+	 * @param subsidyId
+	 * @return 
+	 * List<OrderTeamReward> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<OrderTeamReward> listBySubsidyId(Long subsidyId);
+	
+	
+	/**
+	 * 鏌ヨ鍙互缁撶畻鐨�
+	 * @Title: listCanSettle
+	 * @Description: 
+	 * @param uid
+	 * @param page
+	 * @param pageSize
+	 * @return 
+	 * List<OrderTeamReward> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<OrderTeamReward> listCanSettle(Long uid,int page,int pageSize);
+	
+	/**
+	 * 缁熻鍙互缁撶畻鐨勬暟閲�
+	 * @Title: countCanSettle
+	 * @Description: 
+	 * @param uid
+	 * @return 
+	 * long 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public long countCanSettle(Long uid);
+	
+	
+	/**
+	 * 鑳藉缁撶畻鐨勭敤鎴稩D鍒楄〃
+	 * @Title: listCanSettleUid
+	 * @Description: 
+	 * @param page
+	 * @param count
+	 * @return 
+	 * List<Long> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<Long> listCanSettleUid(Date time, int page,int count);
+	
+	
+	/**
+	 * 鑳藉缁撶畻鐨勭敤鎴稩D鏁伴噺
+	 * @Title: countCanSettleUid
+	 * @Description: 
+	 * @return 
+	 * long 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public long countCanSettleUid(Date time);
+	
+	
 }

--
Gitblit v1.8.0