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