Sfoglia il codice sorgente

转账 - 新增转账订单查询

jason 1 anno fa
parent
commit
753f5de81e

+ 9 - 0
src/api/pay/transfer/index.ts

@@ -16,3 +16,12 @@ export interface TransferVO {
 export const createTransfer = async (data: TransferVO) => {
 export const createTransfer = async (data: TransferVO) => {
   return await request.post({ url: `/pay/transfer/create`, data })
   return await request.post({ url: `/pay/transfer/create`, data })
 }
 }
+
+// 查询转账单列表
+export const getTransferPage = async (params) => {
+  return await request.get({ url: `/pay/transfer/page`, params })
+}
+
+export const getTransfer = async (id: number) => {
+  return await request.get({ url: '/pay/transfer/get?id=' + id })
+}

+ 9 - 2
src/views/pay/demo/transfer/index.vue

@@ -49,13 +49,20 @@
         :formatter="dateFormatter"
         :formatter="dateFormatter"
         width="180px"
         width="180px"
       />
       />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="100"
+        fixed="right"
+      >
         <template #default="scope">
         <template #default="scope">
           <el-button
           <el-button
             link
             link
             type="primary"
             type="primary"
             @click="handleTransfer(scope.row)"
             @click="handleTransfer(scope.row)"
             v-if="scope.row.transferStatus === 0"
             v-if="scope.row.transferStatus === 0"
+            v-hasPermi="['pay:transfer:create']"
           >
           >
             发起转账
             发起转账
           </el-button>
           </el-button>
@@ -73,7 +80,7 @@
 
 
   <!-- 表单弹窗:添加/修改 -->
   <!-- 表单弹窗:添加/修改 -->
   <DemoTransferForm ref="demoFormRef" @success="getList" />
   <DemoTransferForm ref="demoFormRef" @success="getList" />
-  <CreatePayTransfer ref="payTransferRef" :payTransfer="payTransfer" @success="getList" />
+  <CreatePayTransfer ref="payTransferRef" @success="getList" />
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">

+ 1 - 1
src/views/pay/order/OrderDetail.vue

@@ -62,7 +62,7 @@
     <el-divider />
     <el-divider />
     <el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
     <el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
       <el-descriptions-item label="支付通道异步回调内容">
       <el-descriptions-item label="支付通道异步回调内容">
-        {{ detailData.extension.channelNotifyData }}
+        <el-text>{{ detailData.extension.channelNotifyData }}</el-text>
       </el-descriptions-item>
       </el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
   </Dialog>
   </Dialog>

+ 4 - 10
src/views/pay/transfer/CreatePayTransfer.vue

@@ -64,14 +64,10 @@ const formLoading = ref(false) // 提交的按钮禁用
 const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
 const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
 defineOptions({ name: 'CreatePayTransfer' })
 defineOptions({ name: 'CreatePayTransfer' })
 
 
-const props = defineProps({
-  payTransfer: {
-    type: Object as PropType<PayTransferApi.TransferVO>,
-    required: true
-  }
-})
 // 提交数据
 // 提交数据
-let submitTransferData = {
+let submitTransferData: PayTransferApi.TransferVO
+
+const transfer = reactive({
   appId: undefined,
   appId: undefined,
   channelCode: undefined,
   channelCode: undefined,
   merchantTransferId: undefined,
   merchantTransferId: undefined,
@@ -81,9 +77,7 @@ let submitTransferData = {
   userName: undefined,
   userName: undefined,
   alipayLogonId: undefined,
   alipayLogonId: undefined,
   openid: undefined
   openid: undefined
-} as PayTransferApi.TransferVO
-
-const transfer = reactive(props.payTransfer)
+})
 const dialogVisible = ref(false)
 const dialogVisible = ref(false)
 const typeName = computed(() => {
 const typeName = computed(() => {
   return getDictLabel(DICT_TYPE.PAY_TRANSFER_TYPE, transfer.type)
   return getDictLabel(DICT_TYPE.PAY_TRANSFER_TYPE, transfer.type)

+ 80 - 0
src/views/pay/transfer/TransferDetail.vue

@@ -0,0 +1,80 @@
+<template>
+  <Dialog v-model="dialogVisible" title="转账单详情" width="700px">
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="商户单号">
+        <el-tag size="small">{{ detailData.merchantTransferId }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="转账单号">
+        <el-tag type="warning" size="small" v-if="detailData.no">{{ detailData.no }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>
+      <el-descriptions-item label="转账状态">
+        <dict-tag :type="DICT_TYPE.PAY_TRANSFER_STATUS" :value="detailData.status" size="small" />
+      </el-descriptions-item>
+      <el-descriptions-item label="转账金额">
+        <el-tag type="success" size="small">¥{{ (detailData.price / 100.0).toFixed(2) }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="转账时间">
+        {{ formatDate(detailData.successTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <!-- 分割线 -->
+    <el-divider />
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="收款人姓名">{{ detailData.userName }}</el-descriptions-item>
+      <el-descriptions-item label="支付宝登录账号" v-if="detailData.type === 1">
+        {{ detailData.alipayLogonId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="微信 openid" v-if="detailData.type === 2">
+        {{ detailData.openid }}
+      </el-descriptions-item>
+      <el-descriptions-item label="支付渠道">
+        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="detailData.channelCode" />
+      </el-descriptions-item>
+      <el-descriptions-item label="支付 IP">{{ detailData.userIp }}</el-descriptions-item>
+      <el-descriptions-item label="渠道单号">
+        <el-tag size="mini" type="success" v-if="detailData.channelTransferNo">
+          {{ detailData.channelTransferNo }}
+        </el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="通知 URL">{{ detailData.notifyUrl }}</el-descriptions-item>
+    </el-descriptions>
+    <el-divider />
+    <el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
+      <el-descriptions-item label="转账渠道通知内容">
+        <el-text>{{ detailData.channelNotifyData }}</el-text>
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider />
+    <div style="text-align: right">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import * as TransferApi from '@/api/pay/transfer'
+import { formatDate } from '@/utils/formatTime'
+defineOptions({ name: 'PayTransferDetail' })
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref({})
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = await TransferApi.getTransfer(id)
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法,用于打开弹窗
+</script>
+
+<style scoped></style>

+ 267 - 0
src/views/pay/transfer/index.vue

@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="100px"
+    >
+      <el-form-item label="转账单号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入转账单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="转账渠道" prop="channelCode">
+        <el-select
+          v-model="queryParams.channelCode"
+          placeholder="请选择支付渠道"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商户单号" prop="merchantTransferId">
+        <el-input
+          v-model="queryParams.merchantTransferId"
+          placeholder="请输入商户单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_TRANSFER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转账状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择转账状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_TRANSFER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="收款人姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入收款人姓名"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="渠道单号" prop="channelTransferNo">
+        <el-input
+          v-model="queryParams.channelTransferNo"
+          placeholder="渠道单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <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-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="应用编号" align="center" prop="appId" />
+      <el-table-column label="类型" align="center" prop="type" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="转账金额" align="center" prop="price">
+        <template #default="scope">
+          <span>¥{{ (scope.row.price / 100.0).toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转账状态" align="center" prop="status" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="订单号" align="left" width="300">
+        <template #default="scope">
+          <p class="transfer-font">
+            <el-tag size="small"> 商户</el-tag>
+            {{ scope.row.merchantTransferId }}
+          </p>
+          <p class="transfer-font" v-if="scope.row.no">
+            <el-tag size="small" type="warning">转账</el-tag>
+            {{ scope.row.no }}
+          </p>
+          <p class="transfer-font" v-if="scope.row.channelTransferNo">
+            <el-tag size="small" type="success">渠道</el-tag>
+            {{ scope.row.channelTransferNo }}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="收款人姓名" align="center" prop="userName" width="120" />
+      <el-table-column label="收款账号" align="left" width="200">
+        <template #default="scope">
+          <p class="transfer-font" v-if="scope.row.alipayLogonId">
+            <el-tag size="small">支付宝登录号</el-tag>
+            {{ scope.row.alipayLogonId }}
+          </p>
+          <p class="transfer-font" v-if="scope.row.openid">
+            <el-tag size="small">微信 openId</el-tag>
+            {{ scope.row.openid }}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="转账标题" align="center" prop="subject" width="120" />
+      <el-table-column label="转账渠道" align="center" prop="channelCode">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="scope.row.channelCode" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="转账成功时间"
+        align="center"
+        prop="successTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row.id)"> 详情 </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <TransferDetail ref="detailRef" />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import * as TransferApi from '@/api/pay/transfer'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import TransferDetail from './TransferDetail.vue'
+defineOptions({ name: 'PayTransfer' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  no: null,
+  appId: null,
+  channelId: null,
+  channelCode: null,
+  merchantTransferId: null,
+  type: null,
+  status: null,
+  successTime: [],
+  price: null,
+  subject: null,
+  userName: null,
+  alipayLogonId: null,
+  openid: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TransferApi.getTransferPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped>
+.transfer-font {
+  padding: 2px 0;
+  font-size: 12px;
+}
+</style>