From 036b33ae03ccd89c6e9941d6a21bc300d3a2bc39 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Mon, 11 Nov 2019 11:16:30 +0800 Subject: [PATCH] =?UTF-8?q?Upd:=E7=99=BB=E5=BD=95=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=94=B1OpenId=E5=8F=98=E6=9B=B4=E4=B8=BAuni?= =?UTF-8?q?onId,=E5=BE=AE=E4=BF=A1=E4=B8=8D=E5=90=8C=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E8=AF=86=E5=88=AB=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?unionid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 4 ++-- .../payment/manage/mappers/system/ClientAccountMapper.java | 4 ++-- .../manage/merchants/core/impls/ClientManagerImpl.java | 1 + .../payment/manage/signin/core/SignInAccountService.java | 4 ++-- .../manage/signin/core/impls/SignInAccountServiceImpl.java | 4 ++-- .../manage/signin/core/impls/SignInStatusManagerImpl.java | 6 +++--- .../payment/manage/mappers/system/ClientAccountMapper.xml | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 77eea959a..6697fd9a5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.79 + 1.2.80 UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index b8388f94d..e040bfce4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2298,8 +2298,8 @@ public class RetailAppServiceImp implements RetailAppService { result.put("remark_contact_phone",contact_phone); result.put("nation_code",account.getString("nation_code")); } - result.put("wechat_bind_status",account.containsKey("wechat_openid")); - if(account.containsKey("wechat_openid")){ + result.put("wechat_bind_status",account.containsKey("wx_unionid")); + if(account.containsKey("wx_unionid")){ result.put("wechat_name",account.getString("wechat_name")); } return result; diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java index 17081b797..1ae4eee05 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java @@ -85,10 +85,10 @@ public interface ClientAccountMapper { /** * 获取绑定微信的最新账号 - * @param openid + * @param unionId * @return */ - JSONObject findOneByOpenIdAndCreateTimeDesc(@Param("wechat_openid")String openid); + JSONObject findOneByUnionIdAndCreateTimeDesc(@Param("wx_unionid")String unionId); JSONObject findOneByPhoneAndCreateTimeDesc(@Param("contact_phone")String contactPhone,@Param("nation_code")String nationCode); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 35a789bf4..e58eae0a9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -1698,6 +1698,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid account.put("wechat_openid", null); account.put("wechat_name", null); account.put("wechat_headimg", null); + account.put("wx_unionid", null); clientAccountMapper.update(account); signInAccountService.clearAccountCache(accountId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java index 80d383b03..f035120e2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java @@ -42,10 +42,10 @@ public interface SignInAccountService { /** * 获取绑定微信最新的账号 - * @param openid + * @param unionId * @return */ - JSONObject clientWechatOneSignIn(String openid); + JSONObject clientWechatOneSignIn(String unionId); JSONObject clientWechatAppSignIn(String openId); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index 5e3cc18c1..600727fe9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -363,8 +363,8 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati } @Override - public JSONObject clientWechatOneSignIn(String openid){ - JSONObject account = clientAccountMapper.findOneByOpenIdAndCreateTimeDesc(openid); + public JSONObject clientWechatOneSignIn(String unionId){ + JSONObject account = clientAccountMapper.findOneByUnionIdAndCreateTimeDesc(unionId); if (account == null) { return null; } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java index 98b0bdb4d..736d9023c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java @@ -385,13 +385,13 @@ public class SignInStatusManagerImpl implements SignInStatusManager { if(user==null){ throw new BadRequestException("WeChat users do not exist"); } + String unionId = user.getString("unionid"); String openId = user.getString("openid"); - JSONObject account = signInAccountService.clientWechatOneSignIn(openId); + JSONObject account = signInAccountService.clientWechatOneSignIn(unionId); if (account == null) { JSONObject wechatUserInfo = mpClientAppWechatApiProvider.getApi("merchant-app").appUserInfo(openId,user.getString("access_token")); JSONObject res = new JSONObject(); String nickName = wechatUserInfo.getString("nickname"); - String unionId = wechatUserInfo.getString("unionid"); res.put("bind_status", false); res.put("app_openid", openId); res.put("status", "success"); @@ -405,7 +405,7 @@ public class SignInStatusManagerImpl implements SignInStatusManager { account = getCurrentClient(statusKey); account.put("sign_key", statusKey); result.put("account",account); - result.put("app_openid", openId); + result.put("app_openid", unionId); result.put("bind_status", true); result.put("status", "success"); return result; diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml index 3689e89a3..8abdc3f0d 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml @@ -28,9 +28,9 @@ OR sc.parent_client_id IN (select client_id from sys_clients where client_id =#{client_id} or parent_client_id=#{client_id})); - SELECT * FROM sys_accounts a - WHERE a.is_valid =1 and a.wechat_openid=#{wechat_openid} + WHERE a.is_valid =1 and a.wx_unionid=#{wx_unionid} ORDER BY a.create_time DESC limit 1