From 684779576c02c13cb2a18a7d93e88da7e57fd4b8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 31 三月 2020 11:25:13 +0800
Subject: [PATCH] 2.1 需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index 506e1d1..cea662a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -134,7 +134,7 @@
 				List<ThreeSale> list = listByWorkerId(worker.getId());
 				if (list != null && list.size() > 0) {
 					for (ThreeSale ts : list) {
-						if (!ts.getState() && ts.getExpire() == ThreeSale.EXPIRE_OUTOFDATE) {
+						if (!ts.getState() && ts.getExpire() == ThreeSale.EXPIRE_BREAK) {
 							outOfDateCount++;
 						}
 					}
@@ -179,7 +179,7 @@
 				if (list != null)
 					for (int i = 0; i < list.size(); i++) {
 						if (list.get(i).getState() != null && list.get(i).getState() == false
-								&& list.get(i).getExpire() == ThreeSale.EXPIRE_OUTOFDATE) {// 杩囨湡鐨�
+								&& list.get(i).getExpire() == ThreeSale.EXPIRE_BREAK) {// 杩囨湡鐨�
 							list.remove(i);
 							i--;
 						}
@@ -607,6 +607,27 @@
 	}
 
 	@Override
+	public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid) {
+		return threeSaleMapper.listFirstTeamByUndeleted(start, count, uid);
+	}
+	
+	@Override
+	public long countFirstTeamByUndeleted(Long uid) {
+		return threeSaleMapper.countFirstTeamByUndeleted(uid);
+	}
+	
+	@Override
+	public List<ThreeSale> listSecondTeamByUndeleted(long start, int count, Long uid) {
+		return threeSaleMapper.listSecondTeamByUndeleted(start, count, uid);
+	}
+	
+	@Override
+	public long countSecondTeamByUndeleted(Long uid) {
+		return threeSaleMapper.countSecondTeamByUndeleted(uid);
+	}
+	
+	
+	@Override
 	public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
 		return threeSaleMapper.listSecondTeam(start, count, uid, state);
 	}

--
Gitblit v1.8.0