From 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 18 四月 2019 12:31:28 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
index 41f50f2..8f76072 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -11,6 +12,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
@@ -173,6 +175,21 @@
}
return userInfoExtra;
+ }
+
+ @Override
+ public void createUserInfoExtra (Long uid) throws UserInfoExtraException{
+ UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (userInfoExtra != null) {
+ return;
+ }
+
+ userInfoExtra = new UserInfoExtra();
+ userInfoExtra.setUserInfo(new UserInfo(uid));
+ userInfoExtra.setFirstLoginTime(new Date());
+ userInfoExtra.setCreateTime(new Date());
+ userInfoExtra.setUpdateTime(new Date());
+ userInfoExtraMapper.insertSelective(userInfoExtra);
}
@@ -388,7 +405,7 @@
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinWYUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -521,4 +538,25 @@
return userInfoExtraMapper.countByRankId(rankId);
}
+ @Override
+ public boolean isNewUser(Long uid) {
+ boolean isNew = false;
+ if (uid == null) {
+ return isNew;
+ }
+
+ UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (extra != null && extra.getFirstLoginTime() != null) {
+ try {
+ int day = DateUtil.daysBetween(extra.getFirstLoginTime(), new Date());
+ if (day <= 15) {
+ isNew = true;
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ return isNew;
+ }
+
}
--
Gitblit v1.8.0