From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 2b49b9d..c9b0164 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
@@ -322,7 +322,7 @@
}
@Override
- public String activateInviteCode(Long uid, String inviteCode, String platform, String version) throws UserInfoExtraException{
+ public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException{
if (uid == null || inviteCode == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
}
@@ -349,7 +349,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter, platform, version);
+ threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -384,7 +384,7 @@
@Override
- public void activationInviteWX(Long uid, String code, String platform, String version) throws UserInfoExtraException{
+ public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{
if (uid == null || code == null) {
throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
}
@@ -465,7 +465,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale, platform, version);
+ threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0