From e5cd369e4aa14daec2577de960f9d0c503e51444 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 21 Aug 2019 17:31:52 +0800 Subject: [PATCH] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:B=E7=AB=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0POS=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxPosController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPosController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPosController.java index 906995c96..62c73fcb4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPosController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPosController.java @@ -61,11 +61,20 @@ public class WxPosController extends BaseController { @ApiOperation(value = "商户POS用户/B端用户登录检查") @PostMapping("checkUserPassword") - public ResultData checkUserPassword() { + public ResultData checkUserPassword(@RequestBody Map params) { WxMerchantBUser user = getUser(); + String phone = params.get("phone"); + String password = params.get("password"); + //登录凭证不能为空 + if (StringUtils.isBlank(phone)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号不能为空"); + } + if (StringUtils.isBlank(password)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "密码不能为空"); + } try { String resStr = posUtil.checkUserPassword(posUrl, posDevId, posReqKey, - user.getTenantId(), user.getPhone(), user.getUserPwd()); + user.getTenantId(), phone, password); if (resStr != null) { JSONObject retObj = JSON.parseObject(resStr); Map options = retObj;