From 61c21f17b1ad94e4b0018c7e385195bab21b0b5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 19:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 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 da733f8..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,14 +37,14 @@
 	
 	@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;
 		}
@@ -59,9 +59,8 @@
 			}
 				
 			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)) {
@@ -72,7 +71,7 @@
 			} 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);
@@ -88,7 +87,7 @@
 
 	@Override
 	public long countValid() {
-		return codePublishRecordMapper.countValid();
+		return codePublishRecordMapper.countValid(CodePublishRecord.VALIDTIME);
 	}
 
 	

--
Gitblit v1.8.0