From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 116 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 28 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..03a867b 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;
@@ -148,7 +150,10 @@
}
@Override
- public UserInfoExtra updateUserRankByUid(Long uid) throws UserInfoExtraException{
+ public void updateUserRankByUid(Long uid) throws UserInfoExtraException{
+ if (uid == null || uid == 0) {
+ return;
+ }
boolean isupdateRank = true;
@@ -171,8 +176,21 @@
if (isupdateRank) {
updateRank(userInfoExtra);
}
+ }
+
+ @Override
+ public void createUserInfoExtra (Long uid) throws UserInfoExtraException{
+ UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (userInfoExtra != null) {
+ return;
+ }
- return userInfoExtra;
+ userInfoExtra = new UserInfoExtra();
+ userInfoExtra.setUserInfo(new UserInfo(uid));
+ userInfoExtra.setFirstLoginTime(new Date());
+ userInfoExtra.setCreateTime(new Date());
+ userInfoExtra.setUpdateTime(new Date());
+ userInfoExtraMapper.insertSelective(userInfoExtra);
}
@@ -304,7 +322,7 @@
}
@Override
- public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException{
+ public String activateInviteCode(Long uid, String inviteCode, String platform, String version) throws UserInfoExtraException{
if (uid == null || inviteCode == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
}
@@ -331,7 +349,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
+ threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter, platform, version);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -366,9 +384,9 @@
@Override
- public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{
+ public void activationInviteWX(Long uid, String code, String platform, String version) throws UserInfoExtraException{
if (uid == null || code == null) {
- throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
+ throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
}
// 鐢ㄦ埛淇℃伅
@@ -386,9 +404,8 @@
}
}
-
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinWYUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -397,24 +414,31 @@
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
-
- // 鑷姩缁戝畾寰俊
- UserInfo updateUserInfo = new UserInfo(uid);
- updateUserInfo.setWxName(weiXinUser.getNickname());
- updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
- updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
- updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
- updateUserInfo.setNickName(weiXinUser.getNickname());
- updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
- if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
- updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
+ // 楠岃瘉鏁版嵁
+ String wxUnionIdExist = invitee.getWxUnionId();
+ if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
+ if (newUser != null) {
+ throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
+ }
+
+ // 鑷姩缁戝畾寰俊
+ UserInfo updateUserInfo = new UserInfo(uid);
+ updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
+ updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
+ updateUserInfo.setWxName(weiXinUser.getNickname());
+ updateUserInfo.setNickName(weiXinUser.getNickname());
+ }
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
+ updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
+ updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
+ }
+ userInfoService.updateByPrimaryKeySelective(updateUserInfo);
+
+ } else if (!wxUnionId.equals(wxUnionIdExist)){
+ throw new UserInfoExtraException(1, "缁戝畾寰俊涓庢縺娲诲井淇′笉涓�鑷�");
}
-
- if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
- updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
- }
- userInfoService.updateByPrimaryKeySelective(updateUserInfo);
-
// 閭�璇蜂汉ID -1.5.3鏂扮増
@@ -436,19 +460,19 @@
// 娌℃湁琚個璇疯繃
if (inviterId == null && threeSale == null) {
- throw new UserInfoExtraException(1, "寰俊婵�娲诲け璐�");
+ throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
}
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale);
+ threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale, platform, version);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
e1.printStackTrace();
}
- throw new UserInfoExtraException(1, "婵�娲诲け璐�");
+ throw new UserInfoExtraException(1, "鍏崇郴缁戝畾鏃跺け璐�");
}
@@ -521,4 +545,40 @@
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;
+ }
+
+
+ @Override
+ public UserRank gerUserRank(Long uid) {
+ if(uid == null) {
+ return null;
+ }
+
+ UserInfoExtra userInfoExtra = userInfoExtraMapper.gerUserRank(uid);
+ if (userInfoExtra == null) {
+ return null;
+ }
+ return userInfoExtra.getUserRank();
+ }
+
+
}
--
Gitblit v1.8.0