From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 17 九月 2019 16:58:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java index ae7083f..a01e4c0 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java @@ -1,5 +1,6 @@ package com.yeshi.fanli.service.inter.user; +import com.yeshi.fanli.dto.wx.WXAccountInfoDTO; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.bus.user.UserRank; @@ -46,7 +47,7 @@ * @return * @throws UserInfoExtraException */ - public String activateInviteCode(Long uid, String inviteCode, String platform, String version) throws UserInfoExtraException; + public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException; /** * 鑾峰彇鐢ㄦ埛闄勫姞淇℃伅 @@ -81,7 +82,7 @@ * @param code * @throws UserInfoExtraException */ - public void activationInviteWX(Long uid, String code, String platform, String version) throws UserInfoExtraException; + public void activationInviteWX(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException; /** * 鍒ゆ柇鏄惁鏄柊鐢ㄦ埛 @@ -119,6 +120,6 @@ * @return * @throws UserInfoExtraException */ - public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException; + public UserInfo getInviterInfo(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException; } -- Gitblit v1.8.0