From 838c38adeb0dbc4f37dff5b6f42b81638b2c6675 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Sat, 6 Jan 2024 09:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=B2=E6=8F=90=E7=8E=B0=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/adapayMember/adapayMember.js      |  9 ++++
 .../src/views/financial/financeDetail.vue     | 52 ++++++++++++-------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/jsowell-ui/src/api/adapayMember/adapayMember.js b/jsowell-ui/src/api/adapayMember/adapayMember.js
index a2a372764..890452736 100644
--- a/jsowell-ui/src/api/adapayMember/adapayMember.js
+++ b/jsowell-ui/src/api/adapayMember/adapayMember.js
@@ -73,3 +73,12 @@ export function withdraw(data) {
     data: data,
   });
 }
+
+// 提现记录接口
+export function WithdrawalHistory(data) {
+  return request({
+    url: "/adapay/member/queryWithdrawList  ",
+    method: "post",
+    data: data,
+  });
+}
\ No newline at end of file
diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue
index ab98a4e7c..2557eac45 100644
--- a/jsowell-ui/src/views/financial/financeDetail.vue
+++ b/jsowell-ui/src/views/financial/financeDetail.vue
@@ -124,23 +124,19 @@
             <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
           </div>
         </div>
-        <!-- <div class="margin-right foot4">
-          <div class="color60" @click="already">已提现(元)</div>
-          <div class="margin-20 color">{{ adapayMember.withdrawn }}</div>
+        <div class="margin-right foot4">
+          <el-button type="primary" style="margin-bottom: 20px;" @click="already">已提现</el-button>
           <div>
-            <span class="text">已成功提现到绑定银行卡的金额汇总</span>
+            <span class="text">已成功提现到绑定银行卡的金额</span>
           </div>
-        </div> -->
-        <!-- <div class="margin-right foot4">
-          <el-button type="primary">提现中</el-button>
-        </div> -->
-        <div class="margin-right foot4" style="width: 20%">
+        </div>
+        <!-- <div class="margin-right foot4" style="width: 20%">
           <div class="color60">冻结金额(元)</div>
           <div class="margin-20 color">{{ adapayMember.frzBalance }}</div>
           <div>
             <span class="text">当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span>
           </div>
-        </div>
+        </div> -->
       </template>
     </div>
     <hr />
@@ -170,7 +166,7 @@
       <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
       <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
       <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
-      <el-table-column label="提现申请时间" align="center" prop="applicationTime"/>
+      <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
@@ -208,13 +204,14 @@
     </el-dialog>
     <!-- 提现记录 -->
     <el-dialog title="提现记录" :visible.sync="recordDialog">
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column label="日期" align="center" />
-        <el-table-column label="状态" align="center" />
-        <el-table-column label="金额" align="center"></el-table-column>
+      <el-table :data="payoutInformation" style="width: 100%">
+        <el-table-column label="申请时间" align="center" property="applicationTime" />
+        <el-table-column label="提现编号" align="center" property="withdrawCode" />
+        <el-table-column label="状态" align="center" property="statusDesc" />
+        <el-table-column label="金额" align="center" property="cashAmt" />
       </el-table>
-      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
-        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
+      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
+        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
     </el-dialog>
     <!-- 订单流水 -->
     <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
@@ -243,6 +240,7 @@ import {
   withdraw,
   selectAdapayMember,
   queryAdapayAccountBalance,
+  WithdrawalHistory
 } from "@/api/adapayMember/adapayMember";
 import { getOrderReportDetail } from "@/api/order/order";
 import { getDay } from "@/utils/common";
@@ -293,6 +291,14 @@ export default {
       merchantNature: "",
       showAdapayCorp: "",
       showAccountList: false,
+      //已提现参数
+      getWithdrawnParameters: {
+        merchantId: this.$route.query.merchantId,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      payoutInformation: [],
+      getTotal: 0
     };
   },
   methods: {
@@ -451,7 +457,17 @@ export default {
       this.getList();
     },
     already() {
-      this.recordDialog = true
+      this.recordDialog = true;
+      this.getHistory()
+    },
+    //提现记录
+    getHistory() {
+      console.log('etWithdrawnParameters', this.getWithdrawnParameters);
+      WithdrawalHistory(this.getWithdrawnParameters).then((response) => {
+        console.log("提现记录", response);
+        this.payoutInformation = response.data.list;
+        this.getTotal = response.data.total;
+      });
     }
   },
   created() {