From 2012b3b5db3c6b06535a68f775bcc81b16151b90 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 九月 2019 16:54:00 +0800
Subject: [PATCH] 加入任务

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
index fc2fd27..f95c833 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
@@ -37,24 +37,30 @@
 	
 	@Override
 	public long countValidRecord(Long uid){
-		return codePublishRecordMapper.countValidRecord(uid);
+		return codePublishRecordMapper.countValidRecord(uid, CodePublishRecord.VALIDTIME);
 	}
 	
 	
 	@Override
 	public List<CodePublishRecord> listValid(long start, int count) {
 		
-		List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count);
+		List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count, CodePublishRecord.VALIDTIME);
 		if (listValid == null || listValid.size() == 0) {
 			return listValid;
 		}
 		
-		for (CodePublishRecord codePublishRecord: listValid) {
+		for (int i = 0; i < listValid.size(); i ++) {
+			CodePublishRecord codePublishRecord = listValid.get(i);
 			String inviteCode = codePublishRecord.getInviteCode();
+			if (StringUtil.isNullOrEmpty(inviteCode)) {
+				listValid.remove(i);
+				i--;
+				continue;
+			}
+				
 			String index = inviteCode.substring(0, 1);
-			String end = inviteCode.substring(inviteCode.length()-2, inviteCode.length()-1);
+			String end = inviteCode.substring(inviteCode.length()-1, inviteCode.length());
 			codePublishRecord.setInviteCode("TA鐨勯個璇风爜锛�" + index + "****" + end);
-			
 			
 			String nickName = codePublishRecord.getNickName();
 			if(StringUtil.isNullOrEmpty(nickName)) {
@@ -65,14 +71,14 @@
 			} else {
 				// 涓や釜瀛楀強鍏朵互涓�
 				String index2 = nickName.substring(0, 1);
-				String end2 = nickName.substring(nickName.length()-2, nickName.length()-1);
+				String end2 = nickName.substring(nickName.length()-1, nickName.length());
 				nickName = index2 + "****" + end2;
 			}
 			codePublishRecord.setNickName(nickName);
 			
 			long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid(), 1);
 			long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid(), 1);
-			codePublishRecord.setTeam("鍏辨湁" + (firstTeam + secondTeam) + "涓槦鍛�");
+			codePublishRecord.setTeam(firstTeam + secondTeam);
 		}
 		
 		return listValid;
@@ -81,7 +87,7 @@
 
 	@Override
 	public long countValid() {
-		return codePublishRecordMapper.countValid();
+		return codePublishRecordMapper.countValid(CodePublishRecord.VALIDTIME);
 	}
 
 	

--
Gitblit v1.8.0