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 e25b1f7c1..31ea69fa1 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 @@ -164,6 +164,7 @@ public class AdapayMemberService { String bankAcctType; AdapayMemberInfoVO adapayMemberInfoVO = null; List list = null; + AdapayCorpMemberVO adapayCorpMemberVO = null; if (StringUtils.startsWith(adapayMemberId, Constants.ADAPAY_MEMBER_PREFIX)) { bankAcctType = Constants.ONE; // 查询个人用户 @@ -182,12 +183,13 @@ public class AdapayMemberService { } else { bankAcctType = Constants.TWO; // 查询企业用户 - queryCorpAdapayMemberInfo(adapayMemberId); + adapayCorpMemberVO = queryCorpAdapayMemberInfo(adapayMemberId); } map.put("bankAcctType", bankAcctType); map.put("adapayMember", adapayMemberInfoVO); map.put("settleAccountList", list); + map.put("adapayCorpMember", adapayCorpMemberVO); return map; } @@ -234,19 +236,25 @@ public class AdapayMemberService { } QueryCorpMemberResponse response = JSONObject.parseObject(JSON.toJSONString(member), QueryCorpMemberResponse.class); - AdapayCorpMemberVO vo = new AdapayCorpMemberVO(); - vo.setMemberId(adapayMemberId); - vo.setAddress(response.getAddress()); - vo.setEmail(); - vo.setAreaCode(); - vo.setAuditDesc(); - vo.setName(); - vo.setBusinessScope(); - vo.setLegalMp(); - vo.setLegalPerson(); - vo.setLegalCertId(); - vo.setLegalCertIdExpires(); - return vo; + + AdapayCorpMemberVO corpMemberVO = AdapayCorpMemberVO.builder() + .memberId(adapayMemberId) + .address(response.getAddress()) + .name(response.getName()) + .areaCode(response.getArea_code()) + .provCode(response.getProv_code()) + .auditDesc(response.getAudit_desc()) + .auditState(response.getAudit_state()) + .legalCertIdExpires(response.getLegal_cert_id_expires()) + .businessScope(response.getBusiness_scope()) + .legalMp(response.getLegal_mp()) + .legalPerson(response.getLegal_person()) + .legalCertId(response.getLegal_cert_id()) + .telphone(response.getTelphone()) + .zipCode(response.getZip_code()) + .email(response.getEmail()) + .build(); + return corpMemberVO; } /**