diff --git a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/AuthServiceImpl.java b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/AuthServiceImpl.java index cc6a98b..b0e880a 100644 --- a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/AuthServiceImpl.java @@ -93,10 +93,13 @@ public ByxMchCreateVO getMchCreateUrl() { Company company = getUser().getCompany(); String registerNo = company.getRegisterNo(); - ChinaumsAuthInfo chinaumsAuthInfo = chinaumsAuthInfoRepository.findFirstByMchId(registerNo); + ChinaumsAuthInfo chinaumsAuthInfo = chinaumsAuthInfoRepository.findFirstByCompanyId(company.getId()); if (chinaumsAuthInfo != null && ApplicationStatus.REGISTER_SUCCESS.equals(chinaumsAuthInfo.getApplicationStatus())) { throw new YnceErrorException(YnceError.YNCE_218002); } + if (chinaumsAuthInfo != null && chinaumsAuthInfo.getMchId() != null && !chinaumsAuthInfo.getMchId().equals(registerNo)) { + registerNo = chinaumsAuthInfo.getMchId(); + } ThirdPartyPaySet thirdPartyPaySet = thirdPartyConfigUtil.getPlatform(); JSONObject params = new JSONObject(); if (StringUtils.isNotEmpty(registerNo)) {