anderx лет назад: 7
Родитель
Сommit
1197179f89

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1190,8 +1190,9 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		int diff1,diff2;
 		for(CustomerListOut clo: tmpList){
 			//s1 = StringUtils.isBlank(clo.getLastFollowTime()) ? clo.getTransferTime() : clo.getLastFollowTime();
+			try {
 			if (StringUtils.isNotBlank(clo.getLastFollowTime())){
-				if(Integer.valueOf(clo.getLastFollowTime())>Integer.valueOf(clo.getTransferTime())) {
+				if(DateUtils.parseDate(clo.getLastFollowTime(), AFTConstants.YYYYMMDDHHMMSS).getTime()>DateUtils.parseDate(clo.getTransferTime(), AFTConstants.YYYYMMDDHHMMSS).getTime()) {
 					s1=clo.getLastFollowTime();
 				}else {
 					s1=clo.getTransferTime();
@@ -1200,7 +1201,6 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 				s1=clo.getTransferTime();
 			}
 			s2 = StringUtils.isBlank(clo.getLastSignTime()) ? clo.getTransferTime() : clo.getLastSignTime();
-			try {
 				l1 = DateUtils.parseDate(s1, AFTConstants.YYYYMMDDHHMMSS).getTime();
 				l2 = DateUtils.parseDate(s2, AFTConstants.YYYYMMDDHHMMSS).getTime();
 				diff1 = (int)((l1 + AFTConstants.USER_FOLLOW_LIMIT_MS - now.getTime())/(24*3600*1000));