From 5ce64c87bf36d00968afea8500d02af44209c3b5 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 11 Jul 2023 11:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/adapay/service/AdapayMemberService.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 5f1b8c804..781d0cc48 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
@@ -155,13 +155,12 @@ public class AdapayMemberService {
     public Map<String, Object> selectAdapayMember(String merchantId) throws BaseAdaPayException {
         Map<String, Object> map = Maps.newHashMap();
         AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
-        // if (adapayMemberAccount == null) {
-        //     log.error("通过merchantId:{}, 没有查询到结算账户配置", merchantId);
-        //     return null;
-        // }
-        //
-        // String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
-        String adapayMemberId = "ACM25743626";
+        if (adapayMemberAccount == null) {
+            log.error("通过merchantId:{}, 没有查询到结算账户配置", merchantId);
+            return null;
+        }
+
+        String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
         String bankAcctType;
         AdapayMemberInfoVO adapayMemberInfoVO = null;
         List<AdapaySettleAccountVO> list = null;