From 06c9ac9b43af8492a9dbd1eee1a309170eed71d9 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 31 十二月 2019 12:05:14 +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/UserAccountService.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java index bbb6076..28b1751 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java @@ -3,11 +3,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import com.yeshi.fanli.dto.user.wx.WXMPLoginData; -import com.yeshi.fanli.dto.user.wx.WXMPLoginResult; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.user.LoginResult; import com.yeshi.fanli.entity.bus.user.UserInfo; +import com.yeshi.fanli.entity.bus.user.WeiXinUser; import com.yeshi.fanli.exception.user.UserAccountException; /** @@ -216,6 +215,17 @@ * @throws UserAccountException */ public void bindWeiXin(AcceptData acceptData, Long uid, String code) throws UserAccountException; + + + /** + * 缁戝畾寰俊 V1.5.3 + * + * @param uid + * @param code + * @throws UserAccountException + */ + public void bindWeiXin( Long uid, WeiXinUser wxUser ) throws UserAccountException; + /** * 璐︽埛灏佺 -- Gitblit v1.8.0