From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
index 1279184..a3046f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
@@ -1,16 +1,37 @@
 package com.yeshi.fanli.dao.mybatis.money;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 
 import com.yeshi.fanli.dao.BaseMapper;
 import com.yeshi.fanli.entity.money.TeamEincomeRecord;
 
 public interface TeamEincomeRecordMapper extends BaseMapper<TeamEincomeRecord> {
 
-	TeamEincomeRecord selectByUidAndPreRecieveTimeAndType(Long uid, Date preRecieveTime, int type);
-	
-	TeamEincomeRecord	selectByPrimaryKeyForUpdate(Long id);
+	TeamEincomeRecord selectByUidAndPreRecieveTimeAndType(@Param("uid") Long uid,
+			@Param("preRecieveTime") Date preRecieveTime, @Param("type") int type);
 
-	List<TeamEincomeRecord> listByUidAndPreRecieveTimeAndState(Long uid, Date preRecieveTime, int state);
+	TeamEincomeRecord selectByPrimaryKeyForUpdate(Long id);
+
+	List<TeamEincomeRecord> listByUidAndPreRecieveTimeAndState(@Param("uid") Long uid,
+			@Param("preRecieveTime") Date preRecieveTime, @Param("typeList") List<Integer> typeList,
+			@Param("state") int state);
+
+	public List<Long> listCanRecieveUid(@Param("preRecieveTime") Date preRecieveTime,
+			@Param("typeList") List<Integer> typeList,@Param("start") long start,@Param("count")int count);
+
+	public long countCanRecieveUid(@Param("preRecieveTime") Date preRecieveTime,
+			@Param("typeList") List<Integer> typeList);
+
+	
+	/**
+	 * 缁熻绫诲瀷宸查鍙栭噾棰�
+	 * @param uid
+	 * @param type
+	 * @return
+	 */
+	BigDecimal sumRecieveByType(@Param("uid") Long uid,@Param("type") int type);
 }
\ No newline at end of file

--
Gitblit v1.8.0