From 6dfdd606b6b77af5c4367243d885bc01a929cad1 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 18 Jan 2024 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=BC=80=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/adapay/service/AdapayService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index fadcdab67..3687ed648 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -265,9 +265,15 @@ public class AdapayService { return null; } + String bankAcctType = null; + AdapayMemberInfoVO adapayMemberInfoVO = null; + AdapayCorpMemberVO adapayCorpMemberVO = null; + List list = null; + // 审核失败 if (Constants.TWO.equals(adapayMemberAccount.getStatus())) { - AdapayCorpMemberVO adapayCorpMemberVO = new AdapayCorpMemberVO(); + bankAcctType = Constants.ONE; // 只有企业用户才会审核失败 + adapayCorpMemberVO = new AdapayCorpMemberVO(); MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(adapayMemberAccount.getMerchantId()); if (merchantInfoVO != null) { adapayCorpMemberVO.setName(merchantInfoVO.getMerchantName()); @@ -275,17 +281,16 @@ public class AdapayService { adapayCorpMemberVO.setAuditState("B"); adapayCorpMemberVO.setAuditDesc(adapayMemberAccount.getRemark()); map.put("adapayCorpMember", adapayCorpMemberVO); + map.put("bankAcctType", bankAcctType); + map.put("adapayMember", adapayMemberInfoVO); + map.put("settleAccountList", list); return map; } // 通过merchantId获取appId String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId); - String adapayMemberId = adapayMemberAccount.getAdapayMemberId(); - String bankAcctType; - AdapayMemberInfoVO adapayMemberInfoVO = null; - List list = null; - AdapayCorpMemberVO adapayCorpMemberVO = null; + if (StringUtils.startsWith(adapayMemberId, Constants.ADAPAY_MEMBER_PREFIX)) { bankAcctType = Constants.TWO; // 查询个人用户