|
|
|
@@ -909,7 +909,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (wxMerchant.getId() == null) { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
} |
|
|
|
if(!EnumMerchantAdmin.PUBLIC_ADMIN.getCode().equals(wxMerchant.getIsAdmin())){ |
|
|
|
if(EnumMerchantAdmin.PUBLIC_ADMIN.getCode().equals(wxMerchant.getIsAdmin())){ |
|
|
|
//检查商管商户 |
|
|
|
if (hasMerchantIsAdmin(wxMerchant)) { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_ADMIN_IS_FOUND); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
//删除关联的其他门店用户 |
|
|
|
wxMerchantBUserMapper.deleteOtherMerchant(wxMerchant.getTenantId(),wxMerchant.getId().toString()); |
|
|
|
} |
|
|
|
@@ -1045,6 +1050,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public boolean hasMerchantIsAdmin(WxMerchant wxMerchant) { |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
return wxMerchantMapper.hasMerchantIsAdmin(wxMerchant) > 0 ? true : false; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxMerchant getMerchantByEncode(String encode){ |
|
|
|
return wxMerchantMapper.getMerchantByEncode(encode); |
|
|
|
|