From e9cf2d2103eb985bbd88ece367c5c11ebe1d0417 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 11 Jul 2023 10:35:27 +0800
Subject: [PATCH] update

---
 .../test/java/SpringBootTestController.java   | 12 +++----
 .../response/QueryCorpMemberResponse.java     |  3 ++
 .../adapay/service/AdapayMemberService.java   | 33 ++++++++++++++-----
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 1d8808fe1..36df71005 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -46,7 +46,6 @@ import com.jsowell.pile.vo.web.OrderListVO;
 import com.jsowell.pile.vo.web.PileDetailVO;
 import com.jsowell.service.MemberService;
 import com.jsowell.service.OrderService;
-import com.jsowell.pile.service.PileRemoteService;
 import com.jsowell.service.PileService;
 import com.jsowell.thirdparty.amap.service.AMapService;
 import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
@@ -183,6 +182,7 @@ public class SpringBootTestController {
 	private IMemberBasicInfoService memberBasicInfoService;
 
 
+
 	@Test
 	public void testUpdateConnectorStatus() {
 		String pileConnectorCode = "8800000000000101";
@@ -1093,13 +1093,9 @@ public class SpringBootTestController {
 	}
 
 	@Test
-	public void testMemberRegisterAndLogin() {
-		// String phone = "18512341234";
-		// String merchantId = "18512341234";
-		// String token = memberService.memberRegisterAndLogin(phone, merchantId);
-		// System.out.println(token);
-		// String memberId = JWTUtils.getMemberId(token);
-		// System.out.println(memberId);
+	public void testMemberRegisterAndLogin() throws BaseAdaPayException {
+
+
 	}
 
 	@Test
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryCorpMemberResponse.java b/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryCorpMemberResponse.java
index e0678a6fd..f1fd57ac9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryCorpMemberResponse.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryCorpMemberResponse.java
@@ -77,4 +77,7 @@ public class QueryCorpMemberResponse {
     // 银行卡对应的户名
     private String card_name;
 
+    // 企业结算账户 json字符串
+    private String settle_accounts;
+
 }
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 ac48f49b8..5f1b8c804 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,12 +155,13 @@ 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();
+        // if (adapayMemberAccount == null) {
+        //     log.error("通过merchantId:{}, 没有查询到结算账户配置", merchantId);
+        //     return null;
+        // }
+        //
+        // String adapayMemberId = adapayMemberAccount.getAdapayMemberId();
+        String adapayMemberId = "ACM25743626";
         String bankAcctType;
         AdapayMemberInfoVO adapayMemberInfoVO = null;
         List<AdapaySettleAccountVO> list = null;
@@ -254,10 +255,24 @@ public class AdapayMemberService {
                 .email(response.getEmail())
                 .socialCreditCode(response.getSocial_credit_code())
                 .socialCreditCodeExpires(response.getSocial_credit_code_expires())
-                .bankCode(response.getBank_code())
-                .cardName(response.getCard_name())
-                .cardNo(response.getCard_no())
+                // .bankCode(response.getBank_code())
+                // .cardName(response.getCard_name())
+                // .cardNo(response.getCard_no())
                 .build();
+
+        if (StringUtils.isNotBlank(response.getSettle_accounts())) {
+            JSONObject jsonObject = JSON.parseObject(response.getSettle_accounts());
+            String settleAccountId = jsonObject.getString("id");
+            if (StringUtils.isNotEmpty(settleAccountId)) {
+                AdapaySettleAccountVO adapaySettleAccountVO = queryAdapaySettleAccount(adapayMemberId, settleAccountId);
+                if (adapaySettleAccountVO != null) {
+                    corpMemberVO.setBankCode(adapaySettleAccountVO.getBankCode());
+                    corpMemberVO.setCardName(adapaySettleAccountVO.getCardName());
+                    corpMemberVO.setCardNo(adapaySettleAccountVO.getCardId());
+                }
+            }
+        }
+
         return corpMemberVO;
     }