From 5e17bccfd6016a65ccd09b05bfbcb9dc5fdd2782 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 21 Jan 2024 23:10:04 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E4=BB=98=E5=AF=B9=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/order/pay/PayOrder.api.ts   |  2 +-
 src/views/payment/order/pay/RefundModel.vue   |  2 +-
 .../order/reconcile/ReconcileOrder.api.ts     | 61 +++++++++++++++++++
 ...RefundRecord.api.ts => RefundOrder.api.ts} |  6 +-
 ...fundRecordInfo.vue => RefundOrderInfo.vue} |  4 +-
 ...fundRecordList.vue => RefundOrderList.vue} | 10 +--
 6 files changed, 73 insertions(+), 12 deletions(-)
 create mode 100644 src/views/payment/order/reconcile/ReconcileOrder.api.ts
 rename src/views/payment/order/refund/{RefundRecord.api.ts => RefundOrder.api.ts} (88%)
 rename src/views/payment/order/refund/{RefundRecordInfo.vue => RefundOrderInfo.vue} (96%)
 rename src/views/payment/order/refund/{RefundRecordList.vue => RefundOrderList.vue} (95%)

diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts
index cb88c74f6..9f1d1daab 100644
--- a/src/views/payment/order/pay/PayOrder.api.ts
+++ b/src/views/payment/order/pay/PayOrder.api.ts
@@ -1,7 +1,7 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
-import { RefundableInfo } from '/@/views/payment/order/refund/RefundRecord.api'
+import { RefundableInfo } from '/src/views/payment/order/refund/RefundOrder.api'
 import { PaySyncResult } from "/@/views/payment/record/sync/PaySyncRecord.api";
 
 /**
diff --git a/src/views/payment/order/pay/RefundModel.vue b/src/views/payment/order/pay/RefundModel.vue
index 155c43baf..52b540d8c 100644
--- a/src/views/payment/order/pay/RefundModel.vue
+++ b/src/views/payment/order/pay/RefundModel.vue
@@ -32,7 +32,7 @@
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
   import { useDict } from '/@/hooks/bootx/useDict'
-  import { refund, RefundableInfo } from '../refund/RefundRecord.api'
+  import { refund, RefundableInfo } from '../refund/RefundOrder.api'
   import BasicModal from '/@/components/Modal/src/BasicModal.vue'
   import { FormInstance } from 'ant-design-vue/lib/form'
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/views/payment/order/reconcile/ReconcileOrder.api.ts b/src/views/payment/order/reconcile/ReconcileOrder.api.ts
new file mode 100644
index 000000000..310dac367
--- /dev/null
+++ b/src/views/payment/order/reconcile/ReconcileOrder.api.ts
@@ -0,0 +1,61 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 分页
+ */
+export function page(params: any) {
+  return defHttp.get<PageResult<ReconcileOrder>>({
+    url: '/reconcile/page',
+    params,
+  })
+}
+
+/**
+ * 查看单条
+ */
+export function get(id: string) {
+  return defHttp.get<ReconcileOrder>({
+    url: '/reconcile/get',
+    params: { id },
+  })
+}
+
+/**
+ * 支付对账订单
+ */
+export interface ReconcileOrder extends BaseEntity {
+  // 批次号
+  batchNo?: string
+  // 日期
+  date?: string
+  // 通道
+  channel?: string
+  // 是否下载成功
+  down?: boolean
+  // 是否比对完成
+  compare?: boolean
+  // 错误信息
+  errorMsg?: string
+}
+
+/**
+ * 通用支付对账记录
+ */
+export interface ReconcileDetail extends BaseEntity {
+  // 关联对账订单ID
+  recordOrderId?: string
+  // 交易状态
+  status?: string
+  // 交易类型
+  type?: string
+  // 订单id
+  orderId?: string
+  // 网关订单号
+  gatewayOrderNo?: string
+  // 交易金额
+  amount?: string
+  // 商品名称
+  title?: string
+}
diff --git a/src/views/payment/order/refund/RefundRecord.api.ts b/src/views/payment/order/refund/RefundOrder.api.ts
similarity index 88%
rename from src/views/payment/order/refund/RefundRecord.api.ts
rename to src/views/payment/order/refund/RefundOrder.api.ts
index b58fef5b9..23b6513c4 100644
--- a/src/views/payment/order/refund/RefundRecord.api.ts
+++ b/src/views/payment/order/refund/RefundOrder.api.ts
@@ -6,7 +6,7 @@ import { BaseEntity } from '/#/web'
  * 分页
  */
 export function page(params) {
-  return defHttp.get<Result<PageResult<RefundRecord>>>({
+  return defHttp.get<Result<PageResult<RefundOrder>>>({
     url: '/order/refund/page',
     params,
   })
@@ -16,7 +16,7 @@ export function page(params) {
  * 获取单条
  */
 export function get(paymentId) {
-  return defHttp.get<Result<RefundRecord>>({
+  return defHttp.get<Result<RefundOrder>>({
     url: '/order/refund/findById',
     params: { paymentId },
   })
@@ -35,7 +35,7 @@ export function refund(params) {
 /**
  * 退款记录
  */
-export interface RefundRecord extends BaseEntity {
+export interface RefundOrder extends BaseEntity {
   // 原支付记录id
   paymentId?: string
   // 原业务号
diff --git a/src/views/payment/order/refund/RefundRecordInfo.vue b/src/views/payment/order/refund/RefundOrderInfo.vue
similarity index 96%
rename from src/views/payment/order/refund/RefundRecordInfo.vue
rename to src/views/payment/order/refund/RefundOrderInfo.vue
index c73c45d13..4149a38fb 100644
--- a/src/views/payment/order/refund/RefundRecordInfo.vue
+++ b/src/views/payment/order/refund/RefundOrderInfo.vue
@@ -56,7 +56,7 @@
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { get, RefundRecord } from './RefundRecord.api'
+  import { get, RefundOrder } from './RefundOrder.api'
   import { FormInstance } from 'ant-design-vue/lib/form'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
@@ -77,7 +77,7 @@
   const { dictConvert } = useDict()
   // 表单
   const formRef = $ref<FormInstance>()
-  let form = $ref<RefundRecord>({})
+  let form = $ref<RefundOrder>({})
 
   // 事件
   const emits = defineEmits(['ok'])
diff --git a/src/views/payment/order/refund/RefundRecordList.vue b/src/views/payment/order/refund/RefundOrderList.vue
similarity index 95%
rename from src/views/payment/order/refund/RefundRecordList.vue
rename to src/views/payment/order/refund/RefundOrderList.vue
index 9f178756b..63a581a97 100644
--- a/src/views/payment/order/refund/RefundRecordList.vue
+++ b/src/views/payment/order/refund/RefundOrderList.vue
@@ -49,7 +49,7 @@
         :total="pagination.total"
         @page-change="handleTableChange"
       />
-      <refund-record-info ref="refundRecordInfo" @ok="queryPage" />
+      <refund-order-info ref="refundOrderInfo" @ok="queryPage" />
       <pay-order-info ref="payOrderInfo" />
     </div>
   </div>
@@ -58,9 +58,9 @@
 <script lang="ts" setup>
   import { computed, onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { page } from './RefundRecord.api'
+  import { page } from './RefundOrder.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
-  import RefundRecordInfo from './RefundRecordInfo.vue'
+  import RefundOrderInfo from './RefundOrderInfo.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -98,7 +98,7 @@
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
-  const refundRecordInfo = $ref<any>()
+  const refundOrderInfo = $ref<any>()
   const payOrderInfo = $ref<any>()
 
   onMounted(() => {
@@ -135,7 +135,7 @@
    * 查看
    */
   function show(record) {
-    refundRecordInfo.init(record.id)
+    refundOrderInfo.init(record.id)
   }
 
   /**