diff --git a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ProfitSharingServiceImpl.java b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ProfitSharingServiceImpl.java index 07bff70..84e3f28 100644 --- a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ProfitSharingServiceImpl.java +++ b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ProfitSharingServiceImpl.java @@ -63,6 +63,16 @@ if (ObjectUtil.isNull(targetCompany)) { throw new YnceErrorException("添加关联方失败,参数不正确"); } + boolean needIncludesSourceCompany = isNeedIncludesSourceCompany(sourceCompany); + // 参数 + ProfitSharingPartnerDTO profitSharingPartnerDTO = preparePartnerParams(targetCompany, sourceCompany, needIncludesSourceCompany); + byxTradeWayService.setTradeWayInCert(profitSharingPartnerDTO, profitSharingPartnerDTO.getMerWalletId()); + JSONObject result = byxChinaumsUtil.execute(ByxRouteUtil.ROUTE_PROFITSHARING_ADD_MERREL, (JSONObject) JSONObject.toJSON(profitSharingPartnerDTO), JSONObject.class); + byxCheck(result); + } + + private boolean isNeedIncludesSourceCompany(Company sourceCompany) { + // 接口查询分账方列表,判断源企业是否在分账方列表里面,若有,则最后不需要将源企业添加至银联,若无,则需要。因银联把源企业也视作分账分,主账为平台 ByxChinaumsProfitSharingPartnerVO partnerVO = this.queryPartner(); boolean needIncludesSourceCompany = true; if (partnerVO != null) { @@ -75,11 +85,7 @@ } } } - // 参数 - ProfitSharingPartnerDTO profitSharingPartnerDTO = preparePartnerParams(targetCompany, sourceCompany, needIncludesSourceCompany); - byxTradeWayService.setTradeWayInCert(profitSharingPartnerDTO, profitSharingPartnerDTO.getMerWalletId()); - JSONObject result = byxChinaumsUtil.execute(ByxRouteUtil.ROUTE_PROFITSHARING_ADD_MERREL, (JSONObject) JSONObject.toJSON(profitSharingPartnerDTO), JSONObject.class); - byxCheck(result); + return needIncludesSourceCompany; } private void byxCheck(JSONObject result) {