|
|
|
@@ -415,10 +415,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (wxMerchant.getId() == null) { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
} |
|
|
|
//检查商户名称 |
|
|
|
if (hasMerchant(wxMerchant)) { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); |
|
|
|
} |
|
|
|
|
|
|
|
if(wxMerchant.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { |
|
|
|
// 停用商户 |
|
|
|
WxMerchant oldMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId()); |
|
|
|
@@ -427,6 +424,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
logger.error("停车商户不能被删除"); |
|
|
|
return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); |
|
|
|
} |
|
|
|
} else { |
|
|
|
//检查商户名称 |
|
|
|
if (hasMerchant(wxMerchant)) { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); |
|
|
|
} |
|
|
|
} |
|
|
|
Date date = new Date(); |
|
|
|
wxMerchant.setUpdateDate(date); |
|
|
|
|