From a5949026ab2977e1574a70d7e37f4c90db4e9f99 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 12 Jul 2019 16:32:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=A2=AB=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 1 + .../com/iformall/service/impl/WxMerchantServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index fbd871021..9e3391e0a 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -87,6 +87,7 @@ public enum ErrorCode{ MERCHANT_INFO_NOT_VALID(2013, "商户信息禁用"), MERCHANT_REPORT_DATE_NOT_VALID(999, "上报日期大于当天"), MERCHANT_NAME_IS_FOUND(2014, "商户名称已存在"), + MERCHANT_CAR_NOT_DEL(2015, "停车商户不能被删除"), /** * 券 */ 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 9b9b4a916..e57aa6f59 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -447,6 +447,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (hasMerchant(wxMerchant)) { return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); } + if(wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { + // 停用商户 + if(wxMerchant.getCarVendorType() > 0) { + // 停车商户 + logger.error("停车商户不能被删除"); + return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); + } + } Date date = new Date(); wxMerchant.setUpdateDate(date); wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant);