Explorar el Código

[B端登录][修改][判断商户状态==转equals]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
e0e150e5b1
Se han modificado 1 ficheros con 1 adiciones y 2 borrados
  1. +1
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java

+ 1
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java Ver fichero

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


Cargando…
Cancelar
Guardar