From 189e3aafa77409813eae03c0046c3f9f2ec2b53e Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 29 May 2023 16:56:57 +0800 Subject: [PATCH 1/2] fix --- .../com/iformall/controller/WxInfoController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 5ed47ea2f..c903a7b47 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -301,7 +301,8 @@ public class WxInfoController extends BaseController { * @return */ @PostMapping("/getUserPhoneForBuser") - @ApiOperation(value = "登录后授权获取用户的手机号", notes="{\"appId\":\"string\",\"encryptedData\":\"string\",\"iv\":\"string\",\"openId\":\"string\",\"session_key\":\"string\"}") + @ApiOperation(value = "登录后授权获取用户的手机号", notes="{\"appId\":\"string\",\"encryptedData\":\"string\",\"iv\":\"string\"," + + "\"openId\":\"string\",\"session_key\":\"string\",\"isCheck\":\"string\"}") public ResultData getUserPhoneForBuser(@RequestBody Map map) { logger.debug(map.toString()); Map resultMap = new HashMap(); @@ -310,7 +311,7 @@ public class WxInfoController extends BaseController { String iv = map.get("iv"); String openId = map.get("openId"); String session_key = map.get("session_key"); - + String isCheck = map.get("isCheck"); //登录凭证不能为空 if (StringUtils.isBlank(encryptedData)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "encryptedData 不能为空"); @@ -338,10 +339,12 @@ public class WxInfoController extends BaseController { resultMap.put("msg", "授权手机成功!"); resultMap.put("phone", phone); - try { - checkLoginUserPhone(buser, phone,this.getLoginBUser().getPhone()); - }catch(Exception e) { - return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); + if (StringUtils.isNotBlank(isCheck) && "Y".equals(isCheck)) { + try { + checkLoginUserPhone(buser, phone,this.getLoginBUser().getPhone()); + }catch(Exception e) { + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); + } } return new ResultData(resultMap); From c12785a79646971352f454e4c7c288a1e8ca0337 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 29 May 2023 17:22:20 +0800 Subject: [PATCH 2/2] fix bug --- .../iformall/controller/basic/TtMerchantPoiController.java | 3 ++- .../main/java/com/iformall/controller/BaseController.java | 6 +++--- .../java/com/iformall/controller/WxInfoController.java | 7 +++++++ .../com/iformall/controller/WxMerchantBUserController.java | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index 5e528986f..929793101 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -238,7 +238,8 @@ public class TtMerchantPoiController extends DouyinBaseController { try { boolean isSaas = this.isGoodLifeSaas(); if (!isSaas) { - ttMerchantPoiService.exportTemplate(request, response,false); + //ttMerchantPoiService.exportTemplate(request, response,false); + throw new MallinkException(Result.ERROR,"当前版本无需导出模板"); }else { ttMerchantPoiService.exportTemplate(request, response,true); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index f9fa7d11f..c61ed0ec6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -185,11 +185,11 @@ public class BaseController { return ipaddress; } - public void checkLoginUserPhone(WxMerchantBUser orgUser,Long bUserId,EnumAppPlat appPlat) throws Exception { - if (null == bUserId) { + public void checkLoginUserPhone(WxMerchantBUser orgUser,EnumAppPlat appPlat) throws Exception { + if (null == orgUser) { return; } - CUser user = cuserFactory.getBUserService(appPlat).getById(bUserId, orgUser.getTenantId()); + CUser user = cuserFactory.getBUserService(appPlat).getById(orgUser.getId(), orgUser.getTenantId()); if (null == user) { return; } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index c903a7b47..4261a00ef 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -153,6 +153,13 @@ public class WxInfoController extends BaseController { } } + + try { + this.checkLoginUserPhone(buUser, appPlat); + } catch (Exception e) { + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), e.getMessage()); + } + //处理登陆用户 cUser = cuserFactory.getBUserService(appPlat).handleLoginUser(cUser,null); resultMap.put("token", cUser.getToken()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 975a12f8b..d9f8be3cd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -271,7 +271,7 @@ public class WxMerchantBUserController extends BaseController { if(appPlat == null){ return new ResultData(ErrorCode.APP_PLAT_ERROR); } - checkLoginUserPhone(orgUser, orgUser.getId(),appPlat); + checkLoginUserPhone(orgUser, appPlat); }catch(Exception e) { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); }