From 1b7e35636b45ba9eaf209db825e7919dd6e96604 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 14 Jun 2023 14:48:58 +0800
Subject: [PATCH] update

---
 .../pile/AdapayMemberController.java          | 11 ++-
 .../adapay/service/AdapayMemberService.java   | 12 +++
 .../adapay/vo/AdapaySettleAccountVO.java      | 80 +++++++++++++++++++
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapaySettleAccountVO.java

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
index b76ac7bc1..544abfa60 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
@@ -5,6 +5,7 @@ import com.jsowell.adapay.dto.AdapayMemberInfoDTO;
 import com.jsowell.adapay.service.AdapayMemberService;
 import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
 import com.jsowell.adapay.vo.AdapayMemberInfoVO;
+import com.jsowell.adapay.vo.AdapaySettleAccountVO;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
 import com.jsowell.common.exception.BusinessException;
@@ -65,7 +66,15 @@ public class AdapayMemberController extends BaseController {
      */
     @PostMapping("/selectSettleAccount")
     public AjaxResult selectSettleAccount(@RequestBody AdapayMemberInfoDTO dto) {
-        return null;
+        AjaxResult result;
+        try {
+            AdapaySettleAccountVO vo = adapayMemberService.selectSettleAccount(dto.getMerchantId());
+            result = AjaxResult.success(vo);
+        } catch (Exception e) {
+            logger.error("查询汇付账户余额error", e);
+            result = AjaxResult.error();
+        }
+        return result;
     }
 
     /**
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 e20f0b0d7..1471f4b03 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
@@ -11,6 +11,7 @@ import com.huifu.adapay.model.SettleAccount;
 import com.jsowell.adapay.dto.AdapayMemberInfoDTO;
 import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
 import com.jsowell.adapay.vo.AdapayMemberInfoVO;
+import com.jsowell.adapay.vo.AdapaySettleAccountVO;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
@@ -172,4 +173,15 @@ public class AdapayMemberService {
         vo.setLastAvlBalance(new BigDecimal((String) settleCount.get("last_avl_balance")));
         return vo;
     }
+
+    public AdapaySettleAccountVO selectSettleAccount(String merchantId) {
+        AdapaySettleAccountVO vo = new AdapaySettleAccountVO();
+        // 通过merchantId 查询出汇付会员id 和 结算账户id，用来查询余额
+        AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId);
+        if (adapaySettleAccount == null) {
+            return vo;
+        }
+        BeanUtils.copyProperties(adapaySettleAccount, vo);
+        return vo;
+    }
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapaySettleAccountVO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapaySettleAccountVO.java
new file mode 100644
index 000000000..81a491473
--- /dev/null
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapaySettleAccountVO.java
@@ -0,0 +1,80 @@
+package com.jsowell.adapay.vo;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AdapaySettleAccountVO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 运营商id
+     */
+    private String merchantId;
+
+    /**
+     * 汇付会员id
+     */
+    private String adapayMemberId;
+
+    /**
+     * 结算账户对象 id
+     */
+    private String settleAccountId;
+
+    /**
+     * 银行卡号
+     */
+    private String cardId;
+
+    /**
+     * 银行卡对应的户名
+     */
+    private String cardName;
+
+    /**
+     * 证件号，银行账户类型为对私时，必填
+     */
+    private String certId;
+
+    /**
+     * 证件类型，仅支持：00-身份证，银行账户类型为对私时，必填
+     */
+    private String certType;
+
+    /**
+     * 手机号
+     */
+    private String telNo;
+
+    /**
+     * 银行编码，详见附录 银行代码，银行账户类型对公时，必填
+     */
+    private String bankCode;
+
+    /**
+     * 开户银行名称
+     */
+    private String bankName;
+
+    /**
+     * 银行账户类型：1-对公；2-对私
+     */
+    private String bankAcctType;
+
+    /**
+     * 银行账户开户银行所在省份编码 （省市编码），银行账户类型为对公时，必填
+     */
+    private String provCode;
+
+    /**
+     * 银行账户开户银行所在地区编码（省市编码），银行账户类型为对公时，必填
+     */
+    private String areaCode;
+}