| @@ -5,6 +5,8 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxMerchantBUser; | import com.iformall.domain.po.WxMerchantBUser; | ||||
| import com.iformall.domain.po.WxMsgValidationcode; | 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.WxMerchantBUserService; | ||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| import com.iformall.service.WxMsgValidationcodeService; | import com.iformall.service.WxMsgValidationcodeService; | ||||
| @@ -45,6 +47,7 @@ public class WxMsgValidationcodeController extends BaseController { | |||||
| WxMerchantBUser userQ = new WxMerchantBUser(); | WxMerchantBUser userQ = new WxMerchantBUser(); | ||||
| userQ.setAppId(appid); | userQ.setAppId(appid); | ||||
| userQ.setPhone(phone); | userQ.setPhone(phone); | ||||
| userQ.setStatus(EnumMerchantBUserStatus.VALID.getCode()); | |||||
| WxMerchantBUser user=wxMerchantBUserService.getBUserByAppId(userQ); | WxMerchantBUser user=wxMerchantBUserService.getBUserByAppId(userQ); | ||||
| if (user==null) { | if (user==null) { | ||||
| @@ -52,14 +55,13 @@ public class WxMsgValidationcodeController extends BaseController { | |||||
| return new ResultData(ErrorCode.USER_IS_EMPTY); | return new ResultData(ErrorCode.USER_IS_EMPTY); | ||||
| } | } | ||||
| WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); | WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); | ||||
| if (merchant==null) { | if (merchant==null) { | ||||
| logger.error("B端所在商户不存在, id: " + user.getMerchantId()); | logger.error("B端所在商户不存在, id: " + user.getMerchantId()); | ||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | 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()); | logger.error("B端所在商户已停用, id: " + merchant.getId()); | ||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); | ||||
| } | } | ||||