diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java index 544abfa60..94478d460 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java @@ -1,5 +1,6 @@ package com.jsowell.web.controller.pile; +import com.alibaba.fastjson2.JSON; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.dto.AdapayMemberInfoDTO; import com.jsowell.adapay.service.AdapayMemberService; @@ -28,7 +29,7 @@ public class AdapayMemberController extends BaseController { */ @PostMapping("/createAdapayMember") public AjaxResult createAdapayMember(@RequestBody AdapayMemberInfoDTO dto) { - logger.info("创建汇付会员接口 param:{}", dto); + logger.info("创建汇付会员接口 param:{}", JSON.toJSONString(dto)); AjaxResult result; try { adapayMemberService.createMember(dto); diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 95861dae6..293d8689c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -138,12 +138,17 @@ public class AdapayMemberService { * @return */ public AdapayMemberInfoVO selectAdapayMember(String merchantId) { - AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByMerchantId(merchantId); - if (adapayMemberInfo == null) { - return null; - } AdapayMemberInfoVO resultVO = new AdapayMemberInfoVO(); - BeanUtils.copyProperties(adapayMemberInfo, resultVO); + AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByMerchantId(merchantId); + if (adapayMemberInfo != null) { + BeanUtils.copyProperties(adapayMemberInfo, resultVO); + } + + // 通过merchantId 查询出汇付会员id 和 结算账户id,用来查询余额 + AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId); + if (adapaySettleAccount != null) { + BeanUtils.copyProperties(adapaySettleAccount, resultVO); + } return resultVO; } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java index 6fda095b0..4d71b2529 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java @@ -18,4 +18,64 @@ public class AdapayMemberInfoVO { private String gender; // 昵称 private String nickname; + + /** + * 汇付会员id + */ + private String adapayMemberId; + + /** + * 结算账户对象 id + */ + private String settleAccountId; + + /** + * 银行卡号 + */ + private String cardId; + + /** + * 银行卡对应的户名 + */ + private String cardName; + + /** + * 证件号,银行账户类型为对私时,必填 + */ + private String certId; + + /** + * 证件类型,仅支持:00-身份证,银行账户类型为对私时,必填 + */ + private String certType; + + /** + * 手机号 + */ + private String telNo; + + /** + * 银行编码,详见附录 银行代码,银行账户类型对公时,必填 + */ + private String bankCode; + + /** + * 开户银行名称 + */ + private String bankName; + + /** + * 银行账户类型:1-对公;2-对私 + */ + private String bankAcctType; + + /** + * 银行账户开户银行所在省份编码 (省市编码),银行账户类型为对公时,必填 + */ + private String provCode; + + /** + * 银行账户开户银行所在地区编码(省市编码),银行账户类型为对公时,必填 + */ + private String areaCode; }