diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 96a884127..4976e8f23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -443,10 +443,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()); @@ -455,6 +452,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); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index e1dfc64b5..73df84f32 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -194,7 +194,7 @@ FROM wx_merchant m left join wx_business bu on bu.id = m.business_id - where 1=1 + where 1=1 and m.is_del=0 and m.`name` like concat('%', #{merchantName},'%')