autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-12 22:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-01 11:46:17 +08:00
parent fe78a29daa
commit 597bc7520f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
View File

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