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 0b3eada3f..1ae494cd1 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 @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.IOException; import java.math.BigDecimal; +import java.util.List; import java.util.Map; @Slf4j @@ -155,10 +156,12 @@ public class AdapayMemberService { String adapayMemberId = adapayMemberAccount.getAdapayMemberId(); String bankAcctType; + AdapayMemberInfoVO adapayMemberInfoVO = null; + List list = null; if (StringUtils.startsWith(adapayMemberId, Constants.ADAPAY_MEMBER_PREFIX)) { bankAcctType = Constants.ONE; // 查询个人用户 - AdapayMemberInfoVO adapayMemberInfoVO = queryAdapayMemberInfo(adapayMemberId); + adapayMemberInfoVO = queryAdapayMemberInfo(adapayMemberId); if (adapayMemberInfoVO != null) { adapayMemberInfoVO.setMerchantId(merchantId); } @@ -167,7 +170,8 @@ public class AdapayMemberService { adapaySettleAccountVO.setMerchantId(merchantId); } map.put("adapayMember", adapayMemberInfoVO); - map.put("settleAccountList", Lists.newArrayList(adapaySettleAccountVO)); + list = Lists.newArrayList(adapaySettleAccountVO); + map.put("settleAccountList", list); } else { bankAcctType = Constants.TWO; @@ -175,10 +179,9 @@ public class AdapayMemberService { queryCorpAdapayMemberInfo(adapayMemberId); } - - - map.put("bankAcctType", bankAcctType); + map.put("adapayMember", adapayMemberInfoVO); + map.put("settleAccountList", list); return map; }