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/user/vip/GiveVIPApplyInfoDao.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/vip/GiveVIPApplyInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/vip/GiveVIPApplyInfoDao.java
index 5476309..3959e92 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/vip/GiveVIPApplyInfoDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/vip/GiveVIPApplyInfoDao.java
@@ -28,7 +28,7 @@
 	 * List<GiveVIPApplyInfo> 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public List<GiveVIPApplyInfo> list(Long targetUid, Integer state, int start, int count) {
+	public List<GiveVIPApplyInfo> listByTargetUid(Long targetUid, Integer state, int start, int count) {
 		Query query = new Query();
 
 		List<Criteria> list = new ArrayList<Criteria>();
@@ -50,7 +50,7 @@
 		return findList(query);
 	}
 
-	public long count(Long targetUid, Integer state) {
+	public long countByTargetUid(Long targetUid, Integer state) {
 		Query query = new Query();
 
 		List<Criteria> list = new ArrayList<Criteria>();
@@ -69,6 +69,50 @@
 		}
 		return count(query);
 	}
+	
+	
+	
+	public List<GiveVIPApplyInfo> listBySourceUid(Long sourceUid, Integer state, int start, int count) {
+		Query query = new Query();
+
+		List<Criteria> list = new ArrayList<Criteria>();
+		if (sourceUid != null)
+			list.add(Criteria.where("sourceUid").is(sourceUid));
+
+		if (state != null)
+			list.add(Criteria.where("state").is(state));
+
+		if (list.size() > 0) {
+			Criteria[] cas = new Criteria[list.size()];
+			for (int i = 0; i < list.size(); i++)
+				cas[i] = list.get(i);
+			query.addCriteria(new Criteria().andOperator(cas));
+		}
+		query.skip(start);
+		query.limit(count);
+		query.with(new Sort(Sort.Direction.DESC, "createTime"));
+		return findList(query);
+	}
+
+	public long countBySourceUid(Long sourceUid, Integer state) {
+		Query query = new Query();
+
+		List<Criteria> list = new ArrayList<Criteria>();
+		if (sourceUid != null)
+			list.add(Criteria.where("sourceUid").is(sourceUid));
+
+		if (state != null)
+			list.add(Criteria.where("state").is(state));
+
+		if (list.size() > 0) {
+
+			Criteria[] cas = new Criteria[list.size()];
+			for (int i = 0; i < list.size(); i++)
+				cas[i] = list.get(i);
+			query.addCriteria(new Criteria().andOperator(cas));
+		}
+		return count(query);
+	}
 
 	public void updateSelective(GiveVIPApplyInfo info) {
 		Query query = new Query();

--
Gitblit v1.8.0