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 0044582..81442cd 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,25 +93,28 @@ @Override public ByxMchCreateVO getMchCreateUrl() { Company company = getUser().getCompany(); - String registerNo = company.getRegisterNo(); +// String registerNo = company.getRegisterNo(); company = companyRepository.findById(company.getId()).orElse(null); + if (company == null) { + throw new YnceErrorException(YnceError.YNCE_201001); + } 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(); - } +// 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)) { - params.put("registerNo", registerNo); + if (StringUtils.isNotEmpty(company.getRegisterNo())) { + params.put("registerNo", company.getRegisterNo()); } params.put("jumpType", "11"); params.put("callbackUrl", thirdPartyPaySet.getThirdPartyUrl() + "/templates/goback.html"); params.put("notifyUrl", thirdPartyPaySet.getThirdPartyUrl() + "/chinaums/call_back/byx/result"); ByxMchCreateVO byxMchCreateVO = byxChinaumsUtil.execute(ByxRouteUtil.ROUTE_GET_MERCHANT_OPEN_URL, params, ByxMchCreateVO.class, true); - company.setRegisterNo(registerNo); + company.setRegisterNo(company.getRegisterNo()); companyRepository.saveAndFlush(company); synchronized (this) {