|
|
|
@@ -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); |
|
|
|
|