fix: 支付管理/退款订单 对标 vue2

src/utils/dict.ts

@@ -131,12 +131,8 @@ export enum DICT_TYPE {
 
 
   // ========== PAY 模块 ==========
   // ========== PAY 模块 ==========
   PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
   PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
-  PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型
   PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
   PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
-  PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态
-  PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态
-  PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别
-
+  PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
   PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
   PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
   PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
   PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
 
 

src/views/pay/app/index.vue

@@ -326,7 +326,6 @@ const queryParams = reactive({
   createTime: []
   createTime: []
 })
 })
 const queryFormRef = ref() // 搜索的表单
 const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 
 
 /** 查询列表 */
 /** 查询列表 */
 const getList = async () => {
 const getList = async () => {

src/views/pay/refund/RefundDetail.vue

 <template>
 <template>
-  <Dialog v-model="dialogVisible" title="详情" width="50%">
-    <el-descriptions :column="2">
-      <el-descriptions-item label="商户名称">{{ detailData.merchantName }}</el-descriptions-item>
-      <el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
-      <el-descriptions-item label="商品名称">{{ detailData.subject }}</el-descriptions-item>
-    </el-descriptions>
-    <el-divider />
-    <el-descriptions :column="2">
+  <Dialog v-model="dialogVisible" title="详情" width="700px">
+    <el-descriptions :column="2" label-class-name="desc-label">
       <el-descriptions-item label="商户退款单号">
       <el-descriptions-item label="商户退款单号">
-        <el-tag>{{ detailData.merchantRefundNo }}</el-tag>
+        <el-tag size="small">{{ refundDetail.merchantRefundId }}</el-tag>
       </el-descriptions-item>
       </el-descriptions-item>
-      <el-descriptions-item label="商户订单号">
-        {{ detailData.merchantOrderId }}
+      <el-descriptions-item label="渠道退款单号">
+        <el-tag type="success" size="small" v-if="refundDetail.channelRefundNo">{{
+          refundDetail.channelRefundNo
+        }}</el-tag>
       </el-descriptions-item>
       </el-descriptions-item>
-      <el-descriptions-item label="交易订单号">{{ detailData.tradeNo }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
-    <el-divider />
-    <el-descriptions :column="2">
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="商户支付单号">
+        <el-tag size="small">{{ refundDetail.merchantOrderId }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="渠道支付单号">
+        <el-tag type="success" size="small">{{ refundDetail.channelOrderNo }}</el-tag>
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="应用编号">{{ refundDetail.appId }}</el-descriptions-item>
+      <el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions :column="2" label-class-name="desc-label">
       <el-descriptions-item label="支付金额">
       <el-descriptions-item label="支付金额">
-        <el-tag type="success">￥{{ parseFloat(detailData.payAmount / 100, 2).toFixed(2) }}</el-tag>
+        <el-tag type="success" size="small"
+          >￥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}</el-tag
+        >
       </el-descriptions-item>
       </el-descriptions-item>
       <el-descriptions-item label="退款金额">
       <el-descriptions-item label="退款金额">
-        <el-tag class="tag-purple">
-          ￥{{ parseFloat(detailData.refundAmount / 100).toFixed(2) }}
-        </el-tag>
-      </el-descriptions-item>
-      <el-descriptions-item label="退款类型">
-        <dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="detailData.type" />
+        <el-tag size="mini" type="danger"
+          >￥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}</el-tag
+        >
       </el-descriptions-item>
       </el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions :column="2" label-class-name="desc-label">
       <el-descriptions-item label="退款状态">
       <el-descriptions-item label="退款状态">
-        <dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_STATUS" :value="detailData.status" />
-      </el-descriptions-item>
-      <el-descriptions-item label="创建时间">
-        {{ formatDate(detailData.createTime) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="退款成功时间">
-        {{ formatDate(detailData.successTime) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="退款失效时间">
-        {{ formatDate(detailData.expireTime) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="更新时间">
-        {{ formatDate(detailData.updateTime) }}
+        <dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="refundDetail.status" />
       </el-descriptions-item>
       </el-descriptions-item>
+      <el-descriptions-item label="退款时间">{{
+        formatDate(refundDetail.successTime)
+      }}</el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="创建时间">{{
+        formatDate(refundDetail.createTime)
+      }}</el-descriptions-item>
+      <el-descriptions-item label="更新时间">{{
+        formatDate(refundDetail.updateTime)
+      }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
+    <!-- 分割线 -->
     <el-divider />
     <el-divider />
-    <el-descriptions :column="2">
-      <el-descriptions-item label="支付渠道">
-        {{ detailData.channelCodeName }}
-      </el-descriptions-item>
-      <el-descriptions-item label="支付 IP">
-        {{ detailData.userIp }}
-      </el-descriptions-item>
-      <el-descriptions-item label="回调地址">{{ detailData.notifyUrl }}</el-descriptions-item>
-      <el-descriptions-item label="回调状态">
-        <dict-tag :type="DICT_TYPE.PAY_ORDER_NOTIFY_STATUS" :value="detailData.notifyStatus" />
-      </el-descriptions-item>
-      <el-descriptions-item label="回调时间">
-        {{ formatDate(detailData.notifyTime) }}
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="退款渠道">
+        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="refundDetail.channelCode" />
       </el-descriptions-item>
       </el-descriptions-item>
+      <el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="退款 IP">{{ refundDetail.userIp }}</el-descriptions-item>
+      <el-descriptions-item label="通知 URL">{{ refundDetail.notifyUrl }}</el-descriptions-item>
+    </el-descriptions>
+    <!-- 分割线 -->
     <el-divider />
     <el-divider />
-    <el-descriptions :column="2">
-      <el-descriptions-item label="渠道订单号">
-        {{ detailData.channelOrderNo }}
-      </el-descriptions-item>
-      <el-descriptions-item label="渠道退款单号">
-        {{ detailData.channelRefundNo }}
-      </el-descriptions-item>
-      <el-descriptions-item label="渠道错误码">
-        {{ detailData.channelErrorCode }}
-      </el-descriptions-item>
-      <el-descriptions-item label="渠道错误码描述">
-        {{ detailData.channelErrorMsg }}
-      </el-descriptions-item>
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="渠道错误码">{{
+        refundDetail.channelErrorCode
+      }}</el-descriptions-item>
+      <el-descriptions-item label="渠道错误码描述">{{
+        refundDetail.channelErrorMsg
+      }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
-    <br />
-    <el-descriptions :column="1" border direction="vertical">
-      <el-descriptions-item label="渠道额外参数">
-        {{ detailData.channelExtras }}
+    <el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
+      <el-descriptions-item label="支付通道异步回调内容">
+        {{ refundDetail.channelNotifyData }}
       </el-descriptions-item>
       </el-descriptions-item>
-      <el-descriptions-item label="退款原因">{{ detailData.reason }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
   </Dialog>
   </Dialog>
 </template>
 </template>
@@ -93,7 +88,7 @@ defineOptions({ name: 'PayRefundDetail' })
 
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
 const detailLoading = ref(false) // 表单的加载中
-const detailData = ref({})
+const refundDetail = ref({})
 
 
 /** 打开弹窗 */
 /** 打开弹窗 */
 const open = async (id: number) => {
 const open = async (id: number) => {
@@ -101,7 +96,7 @@ const open = async (id: number) => {
   // 设置数据
   // 设置数据
   detailLoading.value = true
   detailLoading.value = true
   try {
   try {
-    detailData.value = await RefundApi.getRefund(id)
+    refundDetail.value = await RefundApi.getRefund(id)
   } finally {
   } finally {
     detailLoading.value = false
     detailLoading.value = false
   }
   }