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

查询汇付会员 新增merchantKey

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-17 16:42:49 +08:00
parent da4750cddb
commit aeeeb96bec
1 changed files with 10 additions and 3 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

@@ -32,6 +32,7 @@ import com.jsowell.pile.domain.ClearingWithdrawInfo;
import com.jsowell.pile.service.ClearingBillInfoService; import com.jsowell.pile.service.ClearingBillInfoService;
import com.jsowell.pile.service.ClearingWithdrawInfoService; import com.jsowell.pile.service.ClearingWithdrawInfoService;
import com.jsowell.pile.service.IAdapayMemberAccountService; import com.jsowell.pile.service.IAdapayMemberAccountService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +69,9 @@ public class AdapayMemberService {
@Autowired @Autowired
private ClearingBillInfoService clearingBillInfoService; private ClearingBillInfoService clearingBillInfoService;
@Autowired
private IPileMerchantInfoService pileMerchantInfoService;
/** /**
* 创建结算账户 * 创建结算账户
* *
@@ -184,6 +188,9 @@ public class AdapayMemberService {
return null; return null;
} }
// 通过merchantId获取appId
String wechatAppid = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);
String adapayMemberId = adapayMemberAccount.getAdapayMemberId(); String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
String bankAcctType; String bankAcctType;
AdapayMemberInfoVO adapayMemberInfoVO = null; AdapayMemberInfoVO adapayMemberInfoVO = null;
@@ -192,7 +199,7 @@ public class AdapayMemberService {
if (StringUtils.startsWith(adapayMemberId, Constants.ADAPAY_MEMBER_PREFIX)) { if (StringUtils.startsWith(adapayMemberId, Constants.ADAPAY_MEMBER_PREFIX)) {
bankAcctType = Constants.TWO; bankAcctType = Constants.TWO;
// 查询个人用户 // 查询个人用户
adapayMemberInfoVO = queryAdapayMemberInfo(adapayMemberId); adapayMemberInfoVO = queryAdapayMemberInfo(adapayMemberId, wechatAppid);
if (adapayMemberInfoVO != null) { if (adapayMemberInfoVO != null) {
adapayMemberInfoVO.setMerchantId(merchantId); adapayMemberInfoVO.setMerchantId(merchantId);
} }
@@ -221,14 +228,14 @@ public class AdapayMemberService {
/** /**
* 查询汇付会员信息 * 查询汇付会员信息
*/ */
public AdapayMemberInfoVO queryAdapayMemberInfo(String adapayMemberId) throws BaseAdaPayException { public AdapayMemberInfoVO queryAdapayMemberInfo(String adapayMemberId, String wechatAppId) throws BaseAdaPayException {
if (StringUtils.isBlank(adapayMemberId)) { if (StringUtils.isBlank(adapayMemberId)) {
return null; return null;
} }
Map<String, Object> memberParams = Maps.newHashMap(); Map<String, Object> memberParams = Maps.newHashMap();
memberParams.put("member_id", adapayMemberId); memberParams.put("member_id", adapayMemberId);
memberParams.put("app_id", ADAPAY_APP_ID); memberParams.put("app_id", ADAPAY_APP_ID);
Map<String, Object> member = Member.query(memberParams); Map<String, Object> member = Member.query(memberParams, wechatAppId);
log.info("==查询个人用户，请求参数：{}，返回参数：{}", JSON.toJSONString(memberParams), JSON.toJSONString(member)); log.info("==查询个人用户，请求参数：{}，返回参数：{}", JSON.toJSONString(memberParams), JSON.toJSONString(member));
if (member == null || member.isEmpty() || !"succeeded".equals(member.get("status"))) { if (member == null || member.isEmpty() || !"succeeded".equals(member.get("status"))) {