From 79e9bea6bef9760fa04ef64519e99615c7e562d7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 8 May 2025 13:09:25 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90PAY=20=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=91=E7=A4=BA=E4=BE=8B=E8=BD=AC=E8=B4=A6=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E7=A4=BA=E4=BE=8B=E6=8F=90=E7=8E=B0=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E7=90=86=E8=A7=A3=E6=88=90=E6=9C=AC=E6=9B=B4=E4=BD=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/transfer/index.ts                 |   2 +-
 src/utils/dict.ts                             |   1 -
 .../DemoWithdrawForm.vue}                     |  61 ++++----
 .../pay/demo/{transfer => withdraw}/index.vue |  88 ++++--------
 src/views/pay/transfer/CreatePayTransfer.vue  | 135 ------------------
 5 files changed, 56 insertions(+), 231 deletions(-)
 rename src/views/pay/demo/{transfer/DemoTransferForm.vue => withdraw/DemoWithdrawForm.vue} (66%)
 rename src/views/pay/demo/{transfer => withdraw}/index.vue (52%)
 delete mode 100644 src/views/pay/transfer/CreatePayTransfer.vue

diff --git a/src/api/pay/transfer/index.ts b/src/api/pay/transfer/index.ts
index 7a58abf4..2bfc07f3 100644
--- a/src/api/pay/transfer/index.ts
+++ b/src/api/pay/transfer/index.ts
@@ -18,7 +18,7 @@ export const createTransfer = async (data: TransferVO) => {
 }
 
 // 查询转账单列表
-export const getTransferPage = async (params) => {
+export const getTransferPage = async (params: PageParam) => {
   return await request.get({ url: `/pay/transfer/page`, params })
 }
 
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 82114992..947f9f31 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -159,7 +159,6 @@ export enum DICT_TYPE {
   PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
   PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
   PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
-  PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
 
   // ========== MP 模块 ==========
   MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
diff --git a/src/views/pay/demo/transfer/DemoTransferForm.vue b/src/views/pay/demo/withdraw/DemoWithdrawForm.vue
similarity index 66%
rename from src/views/pay/demo/transfer/DemoTransferForm.vue
rename to src/views/pay/demo/withdraw/DemoWithdrawForm.vue
index 0eb7acd2..32de4e1f 100644
--- a/src/views/pay/demo/transfer/DemoTransferForm.vue
+++ b/src/views/pay/demo/withdraw/DemoWithdrawForm.vue
@@ -7,36 +7,31 @@
       label-width="120px"
       v-loading="formLoading"
     >
-      <el-form-item label="转账类型" prop="type">
+      <el-form-item label="提现标题" prop="subject">
+        <el-input v-model="formData.subject" placeholder="请输入提现标题" />
+      </el-form-item>
+      <el-form-item label="提现类型" prop="type">
         <el-radio-group v-model="formData.type">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.PAY_TRANSFER_TYPE)"
-            :key="dict.value"
-            :value="dict.value"
-            :disabled="dict.value === 2 || dict.value === 3 || dict.value === 4"
-          >
-            {{ dict.label }}
-          </el-radio>
+          <el-radio :value="1">支付宝</el-radio>
+          <el-radio :value="2">微信支付</el-radio>
+          <el-radio :value="3">钱包</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="转账金额(元)" prop="price">
+      <el-form-item label="提现金额" prop="price">
         <el-input-number
           v-model="formData.price"
           :min="0"
           :precision="2"
           :step="0.01"
-          placeholder="请输入转账金额"
+          placeholder="请输入提现金额"
           style="width: 200px"
         />
       </el-form-item>
       <el-form-item label="收款人姓名" prop="userName">
         <el-input v-model="formData.userName" placeholder="请输入收款人姓名" />
       </el-form-item>
-      <el-form-item v-show="formData.type === 1" label="支付宝登录账号" prop="alipayLogonId">
-        <el-input v-model="formData.alipayLogonId" placeholder="请输入支付宝登录账号" />
-      </el-form-item>
-      <el-form-item v-show="formData.type === 2" label="微信 openid" prop="openid">
-        <el-input v-model="formData.openid" placeholder="请输入微信 openid" />
+      <el-form-item label="收款人账号" prop="userAccount">
+        <el-input v-model="formData.userAccount" placeholder="请输入收款人账号" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -46,7 +41,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import * as DemoTransferApi from '@/api/pay/demo/transfer'
+import * as DemoWithdrawApi from '@/api/pay/demo/withdraw'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { yuanToFen } from '@/utils'
 const { t } = useI18n() // 国际化
@@ -56,17 +51,19 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  price: undefined,
-  type: undefined,
-  userName: undefined,
-  alipayLogonId: undefined,
-  openid: undefined
+const formData = ref<DemoWithdrawApi.PayDemoWithdrawVO>({
+  subject: '',
+  price: 0,
+  type: 1,
+  userName: '',
+  userAccount: ''
 })
 const formRules = reactive({
-  price: [{ required: true, message: '转账金额不能为空', trigger: 'blur' }],
-  type: [{ required: true, message: '转账类型不能为空', trigger: 'change' }]
+  subject: [{ required: true, message: '提现标题不能为空', trigger: 'blur' }],
+  price: [{ required: true, message: '提现金额不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '提现类型不能为空', trigger: 'change' }],
+  userName: [{ required: true, message: '收款人姓名不能为空', trigger: 'blur' }],
+  userAccount: [{ required: true, message: '收款人账号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -97,7 +94,7 @@ const submitForm = async () => {
     const data = { ...formData.value }
     data.price = yuanToFen(data.price)
     if (formType.value === 'create') {
-      await DemoTransferApi.createDemoTransfer(data)
+      await DemoWithdrawApi.createDemoWithdraw(data)
       message.success(t('common.createSuccess'))
     }
     dialogVisible.value = false
@@ -111,11 +108,11 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    id: undefined,
-    price: undefined,
-    userName: undefined,
-    alipayLogonId: undefined,
-    openid: undefined
+    subject: '',
+    price: 0,
+    type: 1,
+    userName: '',
+    userAccount: ''
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/pay/demo/transfer/index.vue b/src/views/pay/demo/withdraw/index.vue
similarity index 52%
rename from src/views/pay/demo/transfer/index.vue
rename to src/views/pay/demo/withdraw/index.vue
index 44d07b12..78ab131e 100644
--- a/src/views/pay/demo/transfer/index.vue
+++ b/src/views/pay/demo/withdraw/index.vue
@@ -11,8 +11,8 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button type="primary" plain @click="openForm('create')"
-          ><Icon icon="ep:plus" />创建业务转账单
+        <el-button type="primary" plain @click="openForm('create')">
+          <Icon icon="ep:plus" />创建示例提现单
         </el-button>
       </el-form-item>
     </el-form>
@@ -21,27 +21,35 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
-      <el-table-column label="订单编号" align="center" prop="id" />
-      <el-table-column label="转账类型" align="center" prop="type" width="120">
+      <el-table-column label="提现单编号" align="center" prop="id" width="100" />
+      <el-table-column label="提现标题" align="center" prop="subject" min-width="120" />
+      <el-table-column label="提现类型" align="center" prop="type" min-width="90">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_TYPE" :value="scope.row.type" />
+          <el-tag v-if="scope.row.type === 1">支付宝</el-tag>
+          <el-tag v-else-if="scope.row.type === 2">微信支付</el-tag>
+          <el-tag v-else-if="scope.row.type === 3">钱包</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="转账金额" align="center" prop="price">
+      <el-table-column label="提现金额" align="center" prop="price" width="120">
         <template #default="scope">
           <span>￥{{ (scope.row.price / 100.0).toFixed(2) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="收款人姓名" align="center" prop="userName" width="120" />
-      <el-table-column label="支付宝登录账号" align="center" prop="alipayLogonId" width="180" />
-      <el-table-column label="微信 openid" align="center" prop="openid" width="120" />
-      <el-table-column label="转账状态" align="center" prop="transferStatus">
+      <el-table-column label="收款人姓名" align="center" prop="userName" min-width="150" />
+      <el-table-column label="收款人账号" align="center" prop="userAccount" min-width="250" />
+      <el-table-column label="提现状态" align="center" prop="status" width="100">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_STATUS" :value="scope.row.transferStatus" />
+          <el-tag v-if="scope.row.status === 0" type="warning">等待转账</el-tag>
+          <el-tag v-else-if="scope.row.status === 10" type="success">转账成功</el-tag>
+          <el-tag v-else-if="scope.row.status === 20" type="danger">转账失败</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="转账单号" align="center" prop="payTransferId" min-width="120" />
+      <el-table-column label="支付渠道" align="center" prop="transferChannelCode" min-width="180">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="scope.row.transferChannelCode" />
         </template>
       </el-table-column>
-      <el-table-column label="转账单号" align="center" prop="payTransferId" />
-      <el-table-column label="支付渠道" align="center" prop="payChannelCode" />
       <el-table-column
         label="转账时间"
         align="center"
@@ -49,25 +57,6 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="100"
-        fixed="right"
-      >
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="handleTransfer(scope.row)"
-            v-if="scope.row.transferStatus === 0"
-            v-hasPermi="['pay:transfer:create']"
-          >
-            发起转账
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -79,19 +68,14 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <DemoTransferForm ref="demoFormRef" @success="getList" />
-  <CreatePayTransfer ref="payTransferRef" @success="getList" />
+  <DemoWithdrawForm ref="demoFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import * as DemoTransferApi from '@/api/pay/demo/transfer'
-import * as PayTransferApi from '@/api/pay/transfer'
-import DemoTransferForm from './DemoTransferForm.vue'
-import CreatePayTransfer from '../../transfer/CreatePayTransfer.vue'
+import * as DemoWithdrawApi from '@/api/pay/demo/withdraw'
+import DemoWithdrawForm from './DemoWithdrawForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
@@ -102,22 +86,11 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 
-let payTransfer = {
-  appId: undefined,
-  merchantTransferId: undefined,
-  type: undefined,
-  price: undefined,
-  subject: undefined,
-  userName: undefined,
-  alipayLogonId: undefined,
-  openid: undefined
-} as PayTransferApi.TransferVO // 传递给转账订单的数据
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    const data = await DemoTransferApi.getDemoTransferPage(queryParams)
+    const data = await DemoWithdrawApi.getDemoWithdrawPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -137,21 +110,12 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 创建业务转账单操作 */
+/** 创建示例提现单操作 */
 const demoFormRef = ref()
-const payTransferRef = ref()
 const openForm = (type: string) => {
   demoFormRef.value.open(type)
 }
 
-/** 发起转账操作 */
-const handleTransfer = (row: any) => {
-  payTransfer = { ...row }
-  payTransfer.merchantTransferId = row.id.toString()
-  payTransfer.subject = '示例转账'
-  payTransferRef.value.showPayTransfer(payTransfer)
-}
-
 /** 初始化 **/
 onMounted(() => {
   getList()
diff --git a/src/views/pay/transfer/CreatePayTransfer.vue b/src/views/pay/transfer/CreatePayTransfer.vue
deleted file mode 100644
index 68a6db30..00000000
--- a/src/views/pay/transfer/CreatePayTransfer.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <Dialog title="发起转账" v-model="dialogVisible" width="800px">
-    <el-card style="margin-top: 10px">
-      <el-descriptions title="转账信息" :column="2" border>
-        <el-descriptions-item label="转账类型">
-          {{ typeName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="转账金额(元)">
-          ￥{{ (transfer.price / 100.0).toFixed(2) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="收款人姓名">
-          {{ transfer.userName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="支付宝登录账号" v-if="transfer.type === 1">
-          {{ transfer.alipayLogonId }}
-        </el-descriptions-item>
-        <el-descriptions-item label="微信 openid" v-if="transfer.type === 2">
-          {{ transfer.openid }}
-        </el-descriptions-item>
-      </el-descriptions>
-    </el-card>
-    <el-card style="margin-top: 20px">
-      <template #header>
-        <div class="card-header">
-          <span>选择转账渠道</span>
-        </div>
-      </template>
-      <div>
-        <el-radio-group v-model="channelCode">
-          <el-radio
-            value="alipay_pc"
-            :disabled="transfer.type === 2 || transfer.type === 3 || transfer.type === 4"
-          >
-            <img :src="svg_alipay_app" />
-          </el-radio>
-          <el-radio
-            value="wx_app"
-            :disabled="transfer.type === 1 || transfer.type === 3 || transfer.type === 4"
-          >
-            <img :src="svg_wx_app" />
-          </el-radio>
-        </el-radio-group>
-      </div>
-    </el-card>
-    <el-divider />
-    <div style="text-align: right">
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </div>
-  </Dialog>
-</template>
-
-<script lang="ts" setup>
-import * as PayTransferApi from '@/api/pay/transfer'
-import { computed, PropType } from 'vue'
-import { DICT_TYPE, getDictLabel } from '@/utils/dict'
-// 导入图标
-import svg_alipay_app from '@/assets/svgs/pay/icon/alipay_app.svg'
-import svg_wx_app from '@/assets/svgs/pay/icon/wx_app.svg'
-import { yuanToFen } from '@/utils'
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-const formLoading = ref(false) // 提交的按钮禁用
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-defineOptions({ name: 'CreatePayTransfer' })
-
-// 提交数据
-let submitTransferData: PayTransferApi.TransferVO
-
-const transfer = reactive({
-  appId: undefined,
-  channelCode: undefined,
-  merchantTransferId: undefined,
-  type: undefined,
-  price: undefined,
-  subject: undefined,
-  userName: undefined,
-  alipayLogonId: undefined,
-  openid: undefined
-})
-const dialogVisible = ref(false)
-const typeName = computed(() => {
-  return getDictLabel(DICT_TYPE.PAY_TRANSFER_TYPE, transfer.type)
-})
-const channelCode = computed(() => {
-  let channelCode = 'alipay_pc'
-  if (transfer.type === 2) {
-    channelCode = 'wx_app'
-  }
-  // TODO 银行卡和钱包 转账待实现
-  return channelCode
-})
-
-/** 打开弹窗 */
-const showPayTransfer = async (payTransfer: PayTransferApi.TransferVO) => {
-  dialogVisible.value = true
-  submitTransferData = payTransfer
-  transfer.merchantTransferId = payTransfer.merchantTransferId
-  transfer.price = payTransfer.price
-  transfer.userName = payTransfer.userName
-  transfer.type = payTransfer.type
-  transfer.appId = payTransfer.appId
-  transfer.subject = payTransfer.subject
-  transfer.alipayLogonId = payTransfer.alipayLogonId
-  transfer.openid = payTransfer.openid
-}
-/** 关闭弹窗 */
-const close = async () => {
-  dialogVisible.value = false
-}
-defineExpose({ showPayTransfer, close }) // 提供 showPayTransfer， close 方法，用于打开, 关闭弹窗
-
-const submitForm = async () => {
-  // 校验表单
-  formLoading.value = true
-  try {
-    submitTransferData.channelCode = channelCode.value
-    await PayTransferApi.createTransfer(submitTransferData)
-    message.success('发起转账成功. 是否转账成功,以转账订单状态为准')
-    // 发送操作成功的事件
-    emit('success')
-    dialogVisible.value = false
-  } finally {
-    formLoading.value = false
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-</style>