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); }