From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 14 十月 2019 17:44:13 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 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..26242b6 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,8 +1,10 @@ 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; +import com.yeshi.fanli.entity.bus.user.WeiXinUser; import com.yeshi.fanli.exception.user.UserInfoExtraException; import com.yeshi.fanli.vo.user.UserInfoExtraVO; @@ -46,7 +48,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 +83,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 +121,29 @@ * @return * @throws UserInfoExtraException */ - public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException; + public UserInfo getInviterInfo(Long uid, String wxUnionId) throws UserInfoExtraException; + + /** + * 鏇存柊淇℃伅 + 鍔犻攣 + * @param uid + * @return + */ + public UserInfoExtra getByUidForUpdate(Long uid); + + /** + * 鏇存柊鐢ㄦ埛閲戝竵 + * @param id + * @param goldCoin + * @return + */ + public void updateGoldCoin(Long id, Integer goldCoin); + + /** + * 鏂扮増閭�璇锋縺娲� + * @param uid + * @param weiXinUser + * @throws UserInfoExtraException + */ + public void activeInviteWX(Long uid, WeiXinUser weiXinUser) throws UserInfoExtraException; } -- Gitblit v1.8.0