From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 96de5ca..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
@@ -150,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;
@@ -173,8 +176,6 @@
if (isupdateRank) {
updateRank(userInfoExtra);
}
-
- return userInfoExtra;
}
@Override
@@ -321,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銆侀個璇风爜涓嶈兘涓虹┖");
}
@@ -348,7 +349,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
+ threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter, platform, version);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -383,7 +384,7 @@
@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, "婵�娲讳俊鎭笉瀹屾暣");
}
@@ -464,7 +465,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale);
+ threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale, platform, version);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -565,4 +566,19 @@
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