From e0e150e5b1c711cf52c2655266abfa3669fee692 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 30 Oct 2018 14:33:02 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E7=99=BB=E5=BD=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=88=A4=E6=96=AD=E5=95=86=E6=88=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=3D=3D=E8=BD=ACequals]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMerchantBUserController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index fccb722c0..63afa9aed 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -108,7 +108,6 @@ public class WxMerchantBUserController extends BaseController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) { - //return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "经纬度未获取"); logger.info("B端用户: " + phone + " 登录 IP" + ipaddress + ", 经纬度(" + longitude + "," + latitude + ")"); } @@ -141,7 +140,7 @@ public class WxMerchantBUserController extends BaseController { logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - if (merchant.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) { + if (merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())) { logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); }