From 602851d3b13e56fd26a456bdff4e6edb4e148e95 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 26 Jul 2019 17:10:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxMerchantServiceImpl.java | 10 ++++++---- .../src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) 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 dcb00fb54..1b65e551d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -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); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 91c61ebdf..a55974eb5 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -297,7 +297,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},'%')