From d80f6aa0c654d1459ac177de8e99246d7d557c3c Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Tue, 21 Aug 2018 16:45:04 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?][=E4=BF=AE=E5=A4=8D]:=E6=A3=80=E6=9F=A5=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxMerchantBUserController.java | 2 +- .../src/main/java/com/simple/domain/po/WxMerchant.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java index 3e9b1f471..d57d13ff9 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -124,7 +124,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.isValid()) { + if (merchant.getStatus() == 0) { // 0:不可用 logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage( ) + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index db43f5539..02e7bb1c1 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -160,10 +160,6 @@ public class WxMerchant implements Serializable { return status; } - public boolean isValid() { - return status == 1; - } - public void setStatus(Integer status) { this.status = status; }