From cf54dbc352a4f96b6b3ccc11057c07687932fb04 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 22 Jun 2020 22:00:26 +0800 Subject: [PATCH] =?UTF-8?q?[openId][=E4=BF=AE=E6=94=B9]:B=E7=AB=AF?= =?UTF-8?q?=E5=95=86=E6=88=B7openId=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMerchantController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index 59f0c4b65..d40855354 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -100,7 +100,8 @@ public class WxMerchantController extends BaseController { @ApiOperation("获取微信OpenId") @GetMapping("/getOpenIdByPhone") - public ResultData getOpenIdByPhone() { + @ApiImplicitParam(name = "phone", value = "商户C端注册手机号", dataType = "String", paramType = "query", required = true) + public ResultData getOpenIdByPhone(@ModelAttribute String phone) { log.debug("[" + getIpAddr() + "] WxMerchantController::getOpenIdByPhone"); // hasPermission WxMerchantBUser user = getUser(); @@ -109,12 +110,17 @@ public class WxMerchantController extends BaseController { merchant.setId(user.getMerchantId()); WxMerchant wxMerchant = wxMerchantService.findOne(merchant); if ( wxMerchant != null && buser.getPhone().equals(wxMerchant.getLinkPhone()) ) { + if (StringUtils.isBlank(phone)) { + phone = wxMerchant.getLinkPhone(); + } WxCUser cuUser = new WxCUser(); cuUser.updateTenantInfo(getTenantInfo()); - cuUser.setPhone(wxMerchant.getLinkPhone()); + cuUser.setPhone(phone); WxCUser mUser = cUserService.getByObject(cuUser); if (mUser != null) { return new ResultData(mUser.getOpenId()); + } else { + return new ResultData(ErrorCode.USER_IS_EMPTY); } } return new ResultData(ErrorCode.USER_NO_PERMISSION);