From c847b949944b1b8f37b1f9592b744e48ae0300b3 Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Sun, 29 Sep 2024 13:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=AE=98=E6=96=B9=E6=8F=90?=
 =?UTF-8?q?=E5=BF=83&=E5=AE=8C=E6=88=90=E9=92=BB=E7=9F=B3=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/relAgency/relAgency.js                |  23 ++++
 .../guildOperationManagement/diamondFlow.vue  |  86 ++++++++------
 .../officialWithdrawRecord.vue                | 106 ++++++++++++------
 3 files changed, 146 insertions(+), 69 deletions(-)

diff --git a/src/api/relAgency/relAgency.js b/src/api/relAgency/relAgency.js
index cf5d00c..885379e 100644
--- a/src/api/relAgency/relAgency.js
+++ b/src/api/relAgency/relAgency.js
@@ -103,6 +103,14 @@ export const agencyWithdrawBatchSet = query => {
         params: query
     });
 };
+// 官方提现记录 批量驳回
+export const batchReject = query => {
+    return request({
+        url: '/agencyWithdrawExamine/batchReject',
+        method: 'post',
+        params: query
+    });
+};
 
 // 公会开业数据统计
 export const agencyOpenList = query => {
@@ -135,4 +143,19 @@ export const excellentAnchorDetail = query => {
         method: 'get',
         params: query
     });
+};
+
+// =====================================钻石充值流水=======================================
+// 查询
+export const diamondStatistics = query => {
+    return request({
+        url: '/admin/guild/diamondStatistics',
+        method: 'get',
+        params: query
+    });
+};
+//  导出
+export const diamondStatisticsExport = query => {
+    window.location.href = `/admin/guild/diamondStatistics/export?${genQueryParam(query)}`;
+    return;
 };
\ No newline at end of file
diff --git a/src/views/guildOperationManagement/diamondFlow.vue b/src/views/guildOperationManagement/diamondFlow.vue
index 1639e7f..323854a 100644
--- a/src/views/guildOperationManagement/diamondFlow.vue
+++ b/src/views/guildOperationManagement/diamondFlow.vue
@@ -32,7 +32,7 @@
       </div>
     </div>
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
+    <el-button class="primary but" type="primary" @click="getData()"
       >查询</el-button
     >
     <el-button
@@ -44,9 +44,12 @@
         inquire.time = '';
         getData();
       "
-      >充值查询</el-button
+      >重置查询</el-button
     >
-    <el-button class="primary" type="primary" @click="exportInfoFun()"
+    <el-button
+      class="primary"
+      type="primary"
+      @click="diamondStatisticsExportFun()"
       >导出</el-button
     >
 
@@ -57,12 +60,12 @@
       border
       style="width: 100%; margin-top: 25px"
     >
-      <el-table-column prop="x" align="center" label="序号" />
-      <el-table-column prop="x" align="center" label="公会ID" />
-      <el-table-column prop="x" align="center" label="公会昵称" />
-      <el-table-column prop="x" align="center" label="公会长ID" />
-      <el-table-column prop="x" align="center" label="主播人数" />
-      <el-table-column prop="x" align="center" label="钻石流水" />
+      <el-table-column type="index" width="100" align="center" label="序号" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="memberNum" align="center" label="主播人数" />
+      <el-table-column prop="diamondNum" align="center" label="钻石流水" />
     </el-table>
     <!-- 分页 -->
     <el-pagination
@@ -79,7 +82,10 @@
   </div>
 </template>
 <script>
-import {} from "@/api/noblemanNew/noblemanNew";
+import {
+  diamondStatistics,
+  diamondStatisticsExport,
+} from "@/api/relAgency/relAgency";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -106,7 +112,7 @@ export default {
     };
   },
   created() {
-    // this.getData();
+    this.getData();
   },
   methods: {
     // 查询接口
@@ -119,32 +125,41 @@ export default {
         startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
-      //   pageFamily({
-      //     erbanNo: this.inquire.userId,
-      //     referrer: this.inquire.referrer,
-      //     familyName: this.inquire.nick,
-      //     // startDate: startTime,
-      //     // endDate: endTime,
-      //     pageNum: this.currentPage,
-      //     pageSize: this.pageSize,
-      //   }).then((res) => {
-      //     this.total = res.data.total;
-      //     this.tableData = res.data.rows;
-      //     this.loading = false;
-      //   });
-    },
-    beforeAvatarUpload() {
-      ElMessage({
-        showClose: true,
-        message: "上传中~",
-        type: "warning",
+      diamondStatistics({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
       });
     },
-    handleAvatarError() {
-      ElMessage({
-        showClose: true,
-        message: "上传失败！",
-        type: "error",
+    // 导出
+    diamondStatisticsExportFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      diamondStatisticsExport({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
       });
     },
     // 分页导航
@@ -164,6 +179,7 @@ export default {
   .inquire {
     display: inline-block;
     margin-right: 20px;
+    margin-bottom: 20px;
     span {
       margin-right: 10px;
     }
diff --git a/src/views/guildOperationManagement/officialWithdrawRecord.vue b/src/views/guildOperationManagement/officialWithdrawRecord.vue
index 079557d..a92fb88 100644
--- a/src/views/guildOperationManagement/officialWithdrawRecord.vue
+++ b/src/views/guildOperationManagement/officialWithdrawRecord.vue
@@ -28,15 +28,19 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="searchForm.status">
-                <el-option label="已结算" value="1"></el-option>
-                <el-option label="未结算" value="0"></el-option>
+                <el-option label="审核中" value="0"></el-option>
+                <el-option label="审核通过" value="1"></el-option>
+                <el-option label="未通过" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="提现账户" prop="x">
-              <el-input
-                v-model.trim="searchForm.x"
-                placeholder="请输入"
-              ></el-input>
+            <el-form-item label="提现账户" prop="accountType">
+              <el-select v-model="searchForm.accountType">
+                <el-option label="Vodafone" value="VODAFONE"></el-option>
+                <el-option label="Payonner" value="PAYONNER"></el-option>
+                <el-option label="USDT" value="USDT"></el-option>
+                <el-option label="Bank" value="BANK"></el-option>
+                <el-option label="Other" value="OTHER"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="时间" class="large">
               <el-form-item prop="startTime">
@@ -88,27 +92,35 @@
           style="width: 100%"
         >
           <el-table-column type="selection"> </el-table-column>
-          <el-table-column align="center" prop="x" label="MoliStar ID" />
-          <el-table-column align="center" prop="x" label="昵称" />
-          <el-table-column align="center" prop="x" label="用户当前账户状态">
+          <el-table-column align="center" prop="erbanNo" label="MoliStar ID" />
+          <el-table-column align="center" prop="nick" label="昵称" />
+          <el-table-column
+            align="center"
+            prop="status"
+            label="用户当前账户状态"
+          >
             <template v-slot="scope">
               {{
-                scope.row.x == 1
-                  ? "已发放"
-                  : scope.row.x == 2
+                scope.row.x == 0
                   ? "审核中"
-                  : "已驳回"
+                  : scope.row.x == 1
+                  ? "通过"
+                  : "未通过"
               }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="x" label="申请时间" />
-          <el-table-column align="center" prop="x" label="提现账户" />
-          <el-table-column align="center" prop="x" label="提现薪资US" />
-          <el-table-column align="center" prop="x" label="发放币种" />
-          <el-table-column align="center" prop="x" label="发放金额" />
-          <el-table-column align="center" prop="x" label="手续费" />
-          <el-table-column align="center" prop="x" label="核销薪资" />
-          <el-table-column align="center" prop="x" label="驳回理由" />
+          <el-table-column align="center" prop="createTime" label="申请时间" />
+          <el-table-column align="center" prop="accountType" label="提现账户" />
+          <el-table-column
+            align="center"
+            prop="guildUsdNum"
+            label="提现薪资US"
+          />
+          <el-table-column align="center" prop="currency" label="发放币种" />
+          <el-table-column align="center" prop="currencyNum" label="发放金额" />
+          <el-table-column align="center" prop="withdrawRate" label="手续费" />
+          <el-table-column align="center" prop="withdrawNum" label="核销薪资" />
+          <el-table-column align="center" prop="remark" label="驳回理由" />
           <el-table-column align="center" prop="hallSalary" label="操作">
             <template v-slot="scope">
               <el-button
@@ -175,6 +187,7 @@ import {
   agencyWithdrawExamineExport,
   agencyWithdrawSet,
   agencyWithdrawBatchSet,
+  batchReject,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -201,7 +214,8 @@ export default {
         pageSize: 20,
       },
       centerDialogVisible: false, //驳回弹窗
-      centerDialogVisible2: true, //驳回弹窗
+      centerDialogVisibleID: null, //驳回弹窗
+      centerDialogVisible2: false, //操作弹窗
       radio: 1, //驳回原因
       // 搜索表单相关
       searchForm: {
@@ -249,14 +263,12 @@ export default {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
-      searchForm.startTime = dateFormat(
-        searchForm.startTime,
-        "yyyy-MM-dd hh:mm:ss"
-      );
-      searchForm.endTime = dateFormat(
-        searchForm.endTime,
-        "yyyy-MM-dd hh:mm:ss"
-      );
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
       searchForm = JSON.parse(JSON.stringify(searchForm));
       pageParams = JSON.parse(JSON.stringify(pageParams));
       Object.keys(searchForm).forEach((item) => {
@@ -268,7 +280,8 @@ export default {
         }
       });
       Object.assign(pageParams, searchForm);
-
+      console.log(pageParams);
+      console.log(searchForm);
       agencyWithdrawList(pageParams).then((res) => {
         this.tableLoading = false;
         if (res.code == 200) {
@@ -313,6 +326,31 @@ export default {
           });
         });
     },
+    // 批量驳回
+    dialogClick() {
+      batchReject({ ids: this.idStr, remark: this.radio })
+        .then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.getData();
+            this.idStr = null;
+          } else {
+            ElMessage({
+              type: "error",
+              message: res.message,
+            });
+          }
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
     handleChange(row) {
       ElMessageBox.confirm("确定要结算吗", "提示", {
         confirmButtonText: "确定",
@@ -460,8 +498,8 @@ export default {
   white-space: normal !important; /* 允许换行 */
   height: auto !important;
 }
-.boxs2 div{
-  margin-bottom: 10px;  
+.boxs2 div {
+  margin-bottom: 10px;
   font-size: 16px;
 }
 </style>