From aeeeb96bec1c07b3943724c1093aa9b0f544db93 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 17 Aug 2023 16:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B1=87=E4=BB=98=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=20=E6=96=B0=E5=A2=9EmerchantKey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/adapay/service/AdapayMemberService.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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<String, Object> memberParams = Maps.newHashMap();
         memberParams.put("member_id", adapayMemberId);
         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));
 
         if (member == null || member.isEmpty() || !"succeeded".equals(member.get("status"))) {