From eb9da1ad5c4054d9ce3dab2446deade9f5b09c7d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 29 一月 2019 10:25:18 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 7efd7ba..5ffaff0 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,6 +1,8 @@
package com.yeshi.fanli.service.impl.user;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -9,7 +11,6 @@
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;
@@ -139,8 +140,11 @@
if (userInfoExtra != null && userInfoExtra.getId() != null) {
// 鍒ゆ柇褰撴湀鏄惁宸叉洿鏂�
Date rankUpdateTime = userInfoExtra.getRankUpdateTime();
- if (rankUpdateTime != null && DateUtil.isSameMonth(rankUpdateTime, new Date())) {
- isupdateRank = false;
+ if (rankUpdateTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ if (sdf.format(rankUpdateTime).equals(sdf.format(new Date()))) {
+ isupdateRank = false;
+ }
}
} else {
userInfoExtra = new UserInfoExtra();
@@ -232,8 +236,12 @@
break;
}
}
- // 绛夌骇鏇存柊鏃堕棿
- userInfoExtra.setRankUpdateTime(new Date());
+
+ // 绛夌骇鏇存柊鏃堕棿 褰撴湀1鍙�
+ Calendar calendar1=Calendar.getInstance();
+ calendar1.set(Calendar.DAY_OF_MONTH, 1);
+ userInfoExtra.setRankUpdateTime(calendar1.getTime());
+
// 淇濆瓨淇℃伅骞惰繑鍥�
saveUserInfoExtra(userInfoExtra);
@@ -285,6 +293,14 @@
throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
}
+ UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (extra != null) {
+ String inviteCodeHas = extra.getInviteCode();
+ if (inviteCodeHas != null && inviteCodeHas.trim().length() > 0) {
+ throw new UserInfoExtraException(1, "宸插瓨鍦ㄩ個璇风爜,璇峰埛鏂伴〉闈�");
+ }
+ }
+
// 琚個璇蜂汉淇℃伅
UserInfo invitee = userInfoService.selectByPKey(uid);
if (invitee == null) {
--
Gitblit v1.8.0