Browse Source

Merge tag 'refs/tags/jenkins-back-end-2224' into release

develop
release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
e733e3e0ac
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -447,9 +447,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (hasMerchant(wxMerchant)) { if (hasMerchant(wxMerchant)) {
return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); 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("停车商户不能被删除"); logger.error("停车商户不能被删除");
return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL);


Loading…
Cancel
Save