From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index bf71a54..9e5e27d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.orm.hibernate4.HibernateCallback;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.NumberUtil;
 
 import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;
 import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
@@ -24,7 +25,6 @@
 import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
-import org.yeshi.utils.NumberUtil;
 
 @Service
 public class ThreeSaleSerivceImpl implements ThreeSaleSerivce {
@@ -310,6 +310,39 @@
 	public int updateExpire(List<Long> list){
 		return threeSaleMapper.updateExpire(list);
 	}
+
+	@Override
+	public List<ThreeSale> listFirstTeamQuery(long start, int count, Long uid, Integer state, String startTime,
+			String endTime) {
+		return threeSaleMapper.listFirstTeamQuery(start, count, uid, state, startTime, endTime);
+	}
+
+	@Override
+	public long countFirstTeamQuery(Long uid, Integer state, String startTime, String endTime) {
+		return threeSaleMapper.countFirstTeamQuery(uid, state, startTime, endTime);
+	}
+
+	@Override
+	public List<ThreeSale> listSecondTeamQuery(long start, int count, Long uid, Integer state, String startTime,
+			String endTime) {
+		return threeSaleMapper.listSecondTeamQuery(start, count, uid, state, startTime, endTime);
+	}
+
+	@Override
+	public long countSecondTeamQuery(Long uid, Integer state, String startTime, String endTime) {
+		return threeSaleMapper.countSecondTeamQuery(uid, state, startTime, endTime);
+	}
+
+	@Override
+	public List<ThreeSale> listSuperiorQuery(long start, int count, Integer state, Long uid) {
+		return threeSaleMapper.listSuperiorQuery(start, count, state, uid);
+	}
+
+	@Override
+	public long countSuperiorQuery(Integer state, Long uid) {
+		return threeSaleMapper.countSuperiorQuery(state, uid);
+	}
+	
 	
 	
 }

--
Gitblit v1.8.0