This commit is contained in:
2023-07-11 10:35:27 +08:00
parent bba4effd93
commit e9cf2d2103
3 changed files with 31 additions and 17 deletions

View File

@@ -77,4 +77,7 @@ public class QueryCorpMemberResponse {
// 银行卡对应的户名
private String card_name;
// 企业结算账户 json字符串
private String settle_accounts;
}

View File

@@ -155,12 +155,13 @@ public class AdapayMemberService {
public Map<String, Object> selectAdapayMember(String merchantId) throws BaseAdaPayException {
Map<String, Object> map = Maps.newHashMap();
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
if (adapayMemberAccount == null) {
log.error("通过merchantId:{}, 没有查询到结算账户配置", merchantId);
return null;
}
String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
// if (adapayMemberAccount == null) {
// log.error("通过merchantId:{}, 没有查询到结算账户配置", merchantId);
// return null;
// }
//
// String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
String adapayMemberId = "ACM25743626";
String bankAcctType;
AdapayMemberInfoVO adapayMemberInfoVO = null;
List<AdapaySettleAccountVO> list = null;
@@ -254,10 +255,24 @@ public class AdapayMemberService {
.email(response.getEmail())
.socialCreditCode(response.getSocial_credit_code())
.socialCreditCodeExpires(response.getSocial_credit_code_expires())
.bankCode(response.getBank_code())
.cardName(response.getCard_name())
.cardNo(response.getCard_no())
// .bankCode(response.getBank_code())
// .cardName(response.getCard_name())
// .cardNo(response.getCard_no())
.build();
if (StringUtils.isNotBlank(response.getSettle_accounts())) {
JSONObject jsonObject = JSON.parseObject(response.getSettle_accounts());
String settleAccountId = jsonObject.getString("id");
if (StringUtils.isNotEmpty(settleAccountId)) {
AdapaySettleAccountVO adapaySettleAccountVO = queryAdapaySettleAccount(adapayMemberId, settleAccountId);
if (adapaySettleAccountVO != null) {
corpMemberVO.setBankCode(adapaySettleAccountVO.getBankCode());
corpMemberVO.setCardName(adapaySettleAccountVO.getCardName());
corpMemberVO.setCardNo(adapaySettleAccountVO.getCardId());
}
}
}
return corpMemberVO;
}