From 48a204f4c90a80c0bb4e5ba1f9f0f42939cadba8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 01 一月 2020 10:19:34 +0800 Subject: [PATCH] 用户资金记录bug修改，京东，拼多多小程序商品转链 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 13 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 34ab97e..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 @@ -6,6 +6,7 @@ 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; /** @@ -26,8 +27,9 @@ * @return * @throws UserAccountException */ - public LoginResult login(HttpServletRequest request,AcceptData acceptData, Boolean first, String appId, String code, String phone, - UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException; + public LoginResult login(HttpServletRequest request, AcceptData acceptData, Boolean first, String appId, + String code, String phone, UserInfo tbUserInfo, boolean wxinstall, int loginType) + throws UserAccountException; /** * 娌℃湁瀹夎寰俊鏃跺�欑殑鐧诲綍 @@ -40,8 +42,8 @@ * @return * @throws UserAccountException */ - public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone, UserInfo tbUserInfo, int loginType) - throws UserAccountException; + public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone, + UserInfo tbUserInfo, int loginType) throws UserAccountException; /** * 鎵撻�氬井淇¤处鍙蜂笌鍏朵粬绫诲瀷鐨勪竴涓处鍙� @@ -153,7 +155,7 @@ * @param uid * @param code */ - public void changeWXBind(AcceptData acceptData,Long uid, String code) throws UserAccountException; + public void changeWXBind(AcceptData acceptData, Long uid, String code) throws UserAccountException; /** * 娓呯悊鐢ㄦ埛澶村儚 @@ -171,6 +173,7 @@ /** * 鐢佃瘽鍙风爜鐧诲綍 1.5.3 + * * @param request * @param first * @param appId @@ -178,11 +181,12 @@ * @return * @throws UserAccountException */ - public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId) + public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId) throws UserAccountException; /** - *寰俊鐧诲綍 1.5.3 + * 寰俊鐧诲綍 1.5.3 + * * @param request * @param first * @param appId @@ -191,11 +195,12 @@ * @return * @throws UserAccountException */ - public UserInfo loginWinXin(HttpServletRequest request,AcceptData acceptData,int loginType, String code, String appId) - throws UserAccountException; + public UserInfo loginWinXin(HttpServletRequest request, AcceptData acceptData, int loginType, String code, + String appId) throws UserAccountException; /** - * 缁戝畾鐢佃瘽鍙风爜 V1.5.3 + * 缁戝畾鐢佃瘽鍙风爜 V1.5.3 + * * @param uid * @param phone * @throws UserAccountException @@ -203,15 +208,28 @@ public void bindPhoneNew(Long uid, String phone) throws UserAccountException; /** - * 缁戝畾寰俊 V1.5.3 + * 缁戝畾寰俊 V1.5.3 + * * @param uid * @param code * @throws UserAccountException */ - public void bindWeiXin(AcceptData acceptData,Long uid, String code) 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; + /** * 璐︽埛灏佺 + * * @param uid * @param reason */ @@ -219,6 +237,7 @@ /** * 灏佺鐢ㄦ埛鎵�鏈変俊鎭細鎵嬫満鍙枫�佸井淇°�佹窐瀹濄�佹敮浠樺疂 + * * @param uid * @param reason */ @@ -226,6 +245,7 @@ /** * 鍒犻櫎璐︽埛 + * * @param uid * @param reason */ @@ -233,6 +253,7 @@ /** * 闀挎椂闂存湭鐧诲綍璐︽埛鍒犻櫎 + * * @param uid * @param reason */ @@ -240,6 +261,7 @@ /** * 2.0.1 鏂扮櫥褰曟柟寮� -寰俊 + * * @param request * @param acceptData * @param loginType @@ -248,10 +270,12 @@ * @return * @throws UserAccountException */ - public UserInfo loginWeiXinNew(HttpServletRequest request, AcceptData acceptData, int loginType, String wxCode, String appId) throws UserAccountException; + public UserInfo loginWeiXinNew(HttpServletRequest request, AcceptData acceptData, int loginType, String wxCode, + String appId) throws UserAccountException; /** * 鏈敞鍐屼箣鍓嶇粦瀹氭墜鏈哄彿 + * * @param phone * @param key * @param appId @@ -261,4 +285,5 @@ */ public UserInfo bindPhoneToLogin(String phone, String key, String appId, HttpServletRequest request) throws UserAccountException; + } -- Gitblit v1.8.0