|
|
|
@@ -447,9 +447,10 @@ 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.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { |
|
|
|
// 停用商户 |
|
|
|
if(!wxMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){ |
|
|
|
WxMerchant oldMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId()); |
|
|
|
if(!oldMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){ |
|
|
|
// 停车商户 |
|
|
|
logger.error("停车商户不能被删除"); |
|
|
|
return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); |
|
|
|
|