From 32afc0fd34f96cf584ad6721541c13352a7f39a0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 30 Oct 2018 14:25:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=AA=8C=E8=AF=81=E7=A0=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][B=E7=AB=AF=E7=99=BB=E5=BD=95=E6=97=B6=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxMsgValidationcodeController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 685ad48b0..8aef0bd0f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -5,6 +5,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.enums.EnumMerchantBUserStatus; +import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxMsgValidationcodeService; @@ -45,6 +47,7 @@ public class WxMsgValidationcodeController extends BaseController { WxMerchantBUser userQ = new WxMerchantBUser(); userQ.setAppId(appid); userQ.setPhone(phone); + userQ.setStatus(EnumMerchantBUserStatus.VALID.getCode()); WxMerchantBUser user=wxMerchantBUserService.getBUserByAppId(userQ); if (user==null) { @@ -52,14 +55,13 @@ public class WxMsgValidationcodeController extends BaseController { return new ResultData(ErrorCode.USER_IS_EMPTY); } - WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); if (merchant==null) { logger.error("B端所在商户不存在, id: " + user.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - if(merchant.getStatus()==0){ + if(merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())){ logger.error("B端所在商户已停用, id: " + merchant.getId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); }