From 90f06593df68c50454e1af94b6904b14baf5be75 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 21 May 2024 23:00:27 +0800
Subject: [PATCH 1/7] =?UTF-8?q?style=20=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/reconcile/diff/ReconcileDiff.api.ts  | 2 +-
 src/views/payment/reconcile/diff/ReconcileDiffInfo.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/payment/reconcile/diff/ReconcileDiff.api.ts b/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
index 966273dd..d37dee74 100644
--- a/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
+++ b/src/views/payment/reconcile/diff/ReconcileDiff.api.ts
@@ -61,5 +61,5 @@ export interface DiffInfo {
   // 本地订单字段值
   localValue?: string
   // 网关订单字段值
-  gatewayValue?: string
+  outValue?: string
 }
diff --git a/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue b/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
index 24fe8bb5..7a871e07 100644
--- a/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
+++ b/src/views/payment/reconcile/diff/ReconcileDiffInfo.vue
@@ -42,7 +42,7 @@
       </a-descriptions-item>
       <template v-if="form.diffs">
         <a-descriptions-item :label="`${item.fieldName}[差异]`" :key="item" v-for="item in form.diffs">
-          <a-tag>本地</a-tag> : {{ item.localValue }}<br /><a-tag>远程</a-tag> : {{ item.gatewayValue }}
+          <a-tag>本地</a-tag> : {{ item.localValue }}<br /><a-tag>远程</a-tag> : {{ item.outValue }}
         </a-descriptions-item>
       </template>
     </a-descriptions>

From 5af7f39c87ef0bd55d5079e74d2a670c850ae2eb Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 26 May 2024 22:48:29 +0800
Subject: [PATCH 2/7] =?UTF-8?q?style=20=E6=98=BE=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
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/PayOrderInfo.vue | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts
index a3cf2522..8b9d9c60 100644
--- a/src/views/payment/order/pay/PayOrder.api.ts
+++ b/src/views/payment/order/pay/PayOrder.api.ts
@@ -88,6 +88,8 @@ export interface PayOrder extends BaseEntity {
   description?: any
   // 是否支持分账
   allocation?: boolean
+  // 自动分账
+  autoAllocation?: boolean
   // 支付通道
   channel?: string
   // 支付方式
diff --git a/src/views/payment/order/pay/PayOrderInfo.vue b/src/views/payment/order/pay/PayOrderInfo.vue
index a45f2ec5..ef745491 100644
--- a/src/views/payment/order/pay/PayOrderInfo.vue
+++ b/src/views/payment/order/pay/PayOrderInfo.vue
@@ -49,6 +49,12 @@
         <a-descriptions-item label="通知地址" :span="2">
           {{ orderExtra.notifyUrl || '无' }}
         </a-descriptions-item>
+        <a-descriptions-item label="自动分账" :span="1">
+          {{ order.autoAllocation || '无' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="描述" :span="2">
+          {{ order.description }}
+        </a-descriptions-item>
         <a-descriptions-item label="客户IP">
           {{ orderExtra.clientIp }}
         </a-descriptions-item>
@@ -70,9 +76,6 @@
         <a-descriptions-item label="创建时间">
           {{ order.createTime }}
         </a-descriptions-item>
-        <a-descriptions-item label="描述" :span="1">
-          {{ order.description }}
-        </a-descriptions-item>
       </a-descriptions>
     </a-spin>
     <template #footer>

From 332719c6e12f93c7d2c21c9102c6f49b57c4eae5 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 28 May 2024 20:57:05 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat=20=E5=88=86=E8=B4=A6=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/group/AllocationGroup.api.ts   | 14 ++++
 .../group/AllocationGroupConfig.vue           |  1 -
 .../allocation/group/AllocationGroupEdit.vue  | 25 ++++---
 .../allocation/group/AllocationGroupList.vue  | 12 ++--
 .../group/AllocationGroupSelect.vue           |  6 +-
 .../allocation/order/AllocationOrder.api.ts   | 30 +++++++-
 .../order/AllocationOrderDetailInfo.vue       |  3 +
 .../order/AllocationOrderDetailList.vue       |  1 +
 .../allocation/order/AllocationOrderList.vue  |  2 +-
 .../receiver/AllocationReceiver.api.ts        | 34 ++++------
 .../receiver/AllocationReceiverEdit.vue       | 49 +++++++++----
 .../receiver/AllocationReceiverList.vue       | 68 +++----------------
 12 files changed, 133 insertions(+), 112 deletions(-)

diff --git a/src/views/payment/allocation/group/AllocationGroup.api.ts b/src/views/payment/allocation/group/AllocationGroup.api.ts
index a99adf14..4b20e75b 100644
--- a/src/views/payment/allocation/group/AllocationGroup.api.ts
+++ b/src/views/payment/allocation/group/AllocationGroup.api.ts
@@ -102,6 +102,16 @@ export function updateRate(receiverId, rate: number) {
   })
 }
 
+/**
+ * 编码是否存在
+ */
+export function existsByNo(receiverNo) {
+  return defHttp.get<Result<boolean>>({
+    url: '/allocation/group/existsByGroupNo',
+    params: { receiverNo },
+  })
+}
+
 /**
  * 设置默认分账组
  */
@@ -126,6 +136,10 @@ export function cancelDefaultGroup(id) {
  * 分账组
  */
 export interface AllocationGroup extends BaseEntity {
+  /**
+   * 分账组编号
+   */
+  groupNo?: string
   /**
    * 分账组名称
    */
diff --git a/src/views/payment/allocation/group/AllocationGroupConfig.vue b/src/views/payment/allocation/group/AllocationGroupConfig.vue
index 7f90cb6e..42d0ebfa 100644
--- a/src/views/payment/allocation/group/AllocationGroupConfig.vue
+++ b/src/views/payment/allocation/group/AllocationGroupConfig.vue
@@ -114,7 +114,6 @@
       groupId: group.id,
       receivers,
     }
-    createMessage.success('添加中...')
     bindReceivers(param).then(() => {
       createMessage.success('添加成功')
       queryPage()
diff --git a/src/views/payment/allocation/group/AllocationGroupEdit.vue b/src/views/payment/allocation/group/AllocationGroupEdit.vue
index 20927f10..c9e6d9b6 100644
--- a/src/views/payment/allocation/group/AllocationGroupEdit.vue
+++ b/src/views/payment/allocation/group/AllocationGroupEdit.vue
@@ -21,6 +21,9 @@
         <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
+        <a-form-item label="分账组编号" name="groupNo">
+          <a-input v-model:value="form.groupNo" :disabled="!addable" placeholder="请输入分账组编号" />
+        </a-form-item>
         <a-form-item label="分账组名称" name="name">
           <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入分账组名称" />
         </a-form-item>
@@ -53,11 +56,9 @@
 
 <script setup lang="ts">
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { useValidate } from '/@/hooks/bootx/useValidate'
-  import { useMessage } from '/@/hooks/web/useMessage'
   import { computed, nextTick } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { get, add, update, AllocationGroup } from './AllocationGroup.api'
+  import { get, add, update, AllocationGroup, existsByNo } from './AllocationGroup.api'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
@@ -67,7 +68,6 @@
   const {
     initFormEditType,
     handleCancel,
-    search,
     labelCol,
     wrapperCol,
     modalWidth,
@@ -75,12 +75,9 @@
     confirmLoading,
     visible,
     addable,
-    editable,
     showable,
     formEditType,
   } = useFormEdit()
-  const { existsByServer } = useValidate()
-  const { createMessage } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
   // 表单
@@ -91,7 +88,10 @@
   // 校验
   const rules = computed(() => {
     return {
-      name: [{ required: true, message: '请输入账号别名' }],
+      groupNo: [
+        { required: true, message: '请输入分账组编号' },
+        { trigger: 'blur', validator: validateCode },
+      ],
       channel: [{ required: true, message: '请选择所属通道' }],
     } as Record<string, Rule[]>
   })
@@ -148,6 +148,15 @@
     })
   }
 
+  /**
+   * 校验编码重复
+   */
+  async function validateCode() {
+    const { groupNo } = form
+    const res = await existsByNo(groupNo)
+    return res.data ? Promise.reject('该分账组编号已经存在') : Promise.resolve()
+  }
+
   /**
    * 重置表单
    */
diff --git a/src/views/payment/allocation/group/AllocationGroupList.vue b/src/views/payment/allocation/group/AllocationGroupList.vue
index d4ab90b9..91294a6c 100644
--- a/src/views/payment/allocation/group/AllocationGroupList.vue
+++ b/src/views/payment/allocation/group/AllocationGroupList.vue
@@ -20,11 +20,12 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="name" title="名称" :min-width="160">
+        <vxe-column field="groupNo" title="分组编号" :min-width="160">
           <template #default="{ row }">
-            <a-link @click="show(row)">{{ row.name }}</a-link>
+            <a-link @click="show(row)">{{ row.groupNo }}</a-link>
           </template>
         </vxe-column>
+        <vxe-column field="name" title="分组名称" :min-width="160" />
         <vxe-column field="channel" title="所属通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
@@ -83,7 +84,7 @@
 <script setup lang="ts">
   import { computed, onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { cancelDefaultGroup, del, page, setDefaultGroup } from "./AllocationGroup.api";
+  import { cancelDefaultGroup, del, page, setDefaultGroup } from './AllocationGroup.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -100,8 +101,8 @@
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, sortParam, pages, model, loading } =
     useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-  const { dictConvert, dictDropDown } = useDict()
+  const { createMessage, createConfirm } = useMessage()
+  const { dictConvert } = useDict()
 
   const allocationGroupEdit = $ref<any>()
   const allocationGroupConfig = $ref<any>()
@@ -112,6 +113,7 @@
 
   const fields = computed(() => {
     return [
+      { field: 'groupNo', type: STRING, name: '分账组编号', placeholder: '请输入分账组编号' },
       { field: 'name', type: STRING, name: '分账组名称', placeholder: '请输入分账组名称' },
       { field: 'channel', type: LIST, name: '分账通道', placeholder: '请选择分账通道', selectList: payChannelList },
     ] as QueryField[]
diff --git a/src/views/payment/allocation/group/AllocationGroupSelect.vue b/src/views/payment/allocation/group/AllocationGroupSelect.vue
index 22c1f32d..d9cd776c 100644
--- a/src/views/payment/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/payment/allocation/group/AllocationGroupSelect.vue
@@ -15,7 +15,8 @@
     </vxe-toolbar>
     <vxe-table row-id="id" ref="xTable" :height="350" :checkbox-config="checkboxConfig" :loading="loading" :data="pagination.records">
       <vxe-column type="checkbox" width="50" />
-      <vxe-column field="name" title="账号别名" :min-width="100"/>
+      <vxe-column field="receiverNo" title="接收方编号" :min-width="160" />
+      <vxe-column field="name" title="账号别名" :min-width="100" />
       <vxe-column field="receiverType" title="分账接收方类型" :min-width="100">
         <template #default="{ row }">
           <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
@@ -70,14 +71,13 @@
   let currentChannel = $ref<string>('')
   let queryParam = $ref<any>({})
   let relationTypeList = $ref<LabeledValue[]>([])
-  let receiverTypeList = $ref<LabeledValue[]>([])
 
   const xTable = $ref<any>()
   const fields = computed(() => {
     return [
+      { field: 'receiverNo', type: STRING, name: '接收方编号', placeholder: '请输入接收方编号' },
       { field: 'name', type: STRING, name: '账号别名', placeholder: '请输入账号别名' },
       { field: 'relationType', type: LIST, name: '分账关系', placeholder: '请选择分账关系', selectList: relationTypeList },
-      // { field: 'receiverType', type: LIST, name: '接收方类型', placeholder: '请选择分账接收方类型', selectList: receiverTypeList },
     ] as QueryField[]
   })
   const checkboxConfig = {
diff --git a/src/views/payment/allocation/order/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts
index a8e2c78d..a357037c 100644
--- a/src/views/payment/allocation/order/AllocationOrder.api.ts
+++ b/src/views/payment/allocation/order/AllocationOrder.api.ts
@@ -32,6 +32,16 @@ export function get(id) {
   })
 }
 
+/**
+ * 扩展信息
+ */
+export function getExtra(id) {
+  return defHttp.get<Result<AllocationOrder>>({
+    url: '/order/allocation/findById',
+    params: { id },
+  })
+}
+
 /**
  * 明细列表
  */
@@ -75,7 +85,7 @@ export function retry(id) {
 /**
  * 查询分账结果
  */
-export function sync(allocationNo){
+export function sync(allocationNo) {
   return defHttp.post<Result<AllocationOrder>>({
     url: '/order/allocation/sync',
     params: { allocationNo },
@@ -120,6 +130,22 @@ export interface AllocationOrder extends BaseEntity {
   finishTime?: string
 }
 
+/**
+ * 分账扩展订单信息
+ */
+export interface AllocationOrderExtra {
+  // 异步通知地址
+  notifyUrl?: string
+  // 商户扩展参数
+  attach?: string
+  // 附加参数
+  extraParam?: string
+  // 请求时间
+  reqTime?: string
+  // 支付终端ip
+  clientIp?: string
+}
+
 /**
  * 分账订单明细
  */
@@ -138,6 +164,8 @@ export interface AllocationOrderDetail extends BaseEntity {
   receiverAccount?: string
   // 接收方姓名
   receiverName?: string
+  // 接收方编号
+  receiverNo?: string
   // 分账结果
   result?: string
   // 错误代码
diff --git a/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
index cc988ccf..a6e58357 100644
--- a/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
@@ -10,6 +10,9 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions title="" bordered :column="{ md: 2, sm: 1, xs: 1 }">
+        <a-descriptions-item label="接收方编号">
+          {{ order.receiverNo }}
+        </a-descriptions-item>
         <a-descriptions-item label="接收方姓名">
           {{ order.receiverName }}
         </a-descriptions-item>
diff --git a/src/views/payment/allocation/order/AllocationOrderDetailList.vue b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
index 63895f4c..79adc065 100644
--- a/src/views/payment/allocation/order/AllocationOrderDetailList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
@@ -3,6 +3,7 @@
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
     <vxe-table row-id="id" ref="xTable" :data="records" :loading="loading" :cell-style="cellStyle">
       <vxe-column type="seq" width="60" />
+      <vxe-column field="receiverNo" title="接收方编号" :min-width="120" />
       <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
       <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
diff --git a/src/views/payment/allocation/order/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
index 81f5550b..ada9ada4 100644
--- a/src/views/payment/allocation/order/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -38,7 +38,7 @@
         <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
           <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }} </template>
         </vxe-column>
-        <vxe-column field="status" title="状态" :min-width="100">
+        <vxe-column field="status" title="状态" :min-width="120">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('AllocOrderStatus', row.status) }}</a-tag>
           </template>
diff --git a/src/views/payment/allocation/receiver/AllocationReceiver.api.ts b/src/views/payment/allocation/receiver/AllocationReceiver.api.ts
index f4ccf34a..f4cdba15 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiver.api.ts
+++ b/src/views/payment/allocation/receiver/AllocationReceiver.api.ts
@@ -52,6 +52,16 @@ export function add(data: AllocationReceiver) {
   })
 }
 
+/**
+ * 编码是否存在
+ */
+export function existsByNo(receiverNo) {
+  return defHttp.get<Result<boolean>>({
+    url: '/allocation/receiver/existsByReceiverNo',
+    params: { receiverNo },
+  })
+}
+
 /**
  * 修改
  */
@@ -72,32 +82,14 @@ export function del(id) {
   })
 }
 
-/**
- * 同步到三方支付系统中
- */
-export function registerByGateway(id) {
-  return defHttp.post<Result<null>>({
-    url: '/allocation/receiver/registerByGateway',
-    params: { id },
-  })
-}
-
-/**
- * 从三方支付系统中删除
- */
-export function removeByGateway(id) {
-  return defHttp.post<Result<null>>({
-    url: '/allocation/receiver/removeByGateway',
-    params: { id },
-  })
-}
-
 /**
  * 分账接收方
  */
 export interface AllocationReceiver extends BaseEntity {
   // 账号别名
   name?: string
+  // 分账接收方编号
+  receiverNo?: string
   // 所属通道
   channel?: string
   // 分账接收方类型
@@ -110,6 +102,4 @@ export interface AllocationReceiver extends BaseEntity {
   relationType?: string
   // 关系名称
   relationName?: string
-  // 是否已经同步到网关
-  sync?: boolean
 }
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue b/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue
index 10cac4f7..ec45bc81 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue
@@ -2,7 +2,7 @@
   <basic-modal
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="modalWidth"
+    :width="900"
     :title="title"
     :visible="visible"
     :mask-closable="showable"
@@ -21,6 +21,9 @@
         <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
+        <a-form-item label="接收方编号" validate-first name="receiverNo">
+          <a-input v-model:value="form.receiverNo" :disabled="!addable" placeholder="请输入接收方编号" />
+        </a-form-item>
         <a-form-item label="账号别名" name="name">
           <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入账号别名" />
         </a-form-item>
@@ -38,31 +41,32 @@
           <a-select
             style="width: 100%"
             v-model:value="form.receiverType"
-            :disabled="showable || form.sync"
+            :disabled="!addable"
             :options="receiverTypeList"
             placeholder="请选择接收方类型"
           />
         </a-form-item>
         <a-form-item label="接收方账号" name="receiverAccount">
-          <a-input v-model:value="form.receiverAccount" :disabled="showable || form.sync" placeholder="请输入接收方账号" />
+          <a-input v-model:value="form.receiverAccount" :disabled="!addable" placeholder="请输入接收方账号">
+            <template v-if="['wx_personal', 'ali_open_id'].includes(form.receiverType as string)" #suffix>
+              <icon icon="ant-design:qrcode-outlined" @click="showQrCode" />
+            </template>
+          </a-input>
         </a-form-item>
         <a-form-item label="接收方姓名" name="receiverName">
-          <a-input v-model:value="form.receiverName" :disabled="showable || form.sync" placeholder="请输入接收方姓名" />
+          <a-input v-model:value="form.receiverName" :disabled="!addable" placeholder="请输入接收方姓名" />
         </a-form-item>
         <a-form-item label="分账关系类型" name="relationType">
           <a-select
             style="width: 100%"
             v-model:value="form.relationType"
-            :disabled="showable || form.sync"
+            :disabled="!addable"
             :options="relationTypeList"
             placeholder="请选择分账关系类型"
           />
         </a-form-item>
         <a-form-item v-if="form.relationType === 'CUSTOM'" label="接收者关系名称" name="relationName">
-          <a-input v-model:value="form.relationName" :disabled="showable || form.sync" placeholder="请输入接收者关系名称" />
-        </a-form-item>
-        <a-form-item label="备注" name="remark">
-          <a-textarea :disabled="showable" placeholder="请输入备注" v-model:value="form.remark" />
+          <a-input v-model:value="form.relationName" :disabled="!addable" placeholder="请输入接收者关系名称" />
         </a-form-item>
       </a-form>
     </a-spin>
@@ -81,11 +85,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { computed, nextTick } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { add, get, AllocationReceiver, update, findChannels, findReceiverTypeByChannel } from './AllocationReceiver.api'
+  import { add, get, AllocationReceiver, update, findChannels, findReceiverTypeByChannel, existsByNo } from './AllocationReceiver.api'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   import { LabeledValue } from 'ant-design-vue/lib/select'
+  import Icon from '/@/components/Icon'
 
   const {
     initFormEditType,
@@ -98,7 +103,6 @@
     confirmLoading,
     visible,
     addable,
-    editable,
     showable,
     formEditType,
   } = useFormEdit()
@@ -117,7 +121,10 @@
   // 校验
   const rules = computed(() => {
     return {
-      name: [{ required: true, message: '请输入账号别名' }],
+      receiverNo: [
+        { required: true, message: '请输入账号别名' },
+        { trigger: 'blur', validator: validateCode },
+      ],
       channel: [{ required: true, message: '请选择所属通道' }],
       receiverType: [{ required: true, message: '请选择分账接收方类型' }],
       receiverAccount: [{ required: true, message: '请输入接收方账号' }],
@@ -143,7 +150,7 @@
    */
   async function initData() {
     findChannels().then(({ data }) => (payChannelList = data))
-    relationTypeList = await dictDropDown('AllocationRelationType')
+    relationTypeList = await dictDropDown('AllocRelationType')
   }
 
   /**
@@ -191,6 +198,22 @@
     })
   }
 
+  /**
+   * 扫码绑定
+   */
+  function showQrCode() {
+    createMessage.info('扫码获取OpenID开发中, 敬请期待')
+  }
+
+  /**
+   * 校验编码重复
+   */
+  async function validateCode() {
+    const { receiverNo } = form
+    const res = await existsByNo(receiverNo)
+    return res.data ? Promise.reject('该接收方编号已经存在') : Promise.resolve()
+  }
+
   /**
    * 重置表单
    */
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverList.vue b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
index b16d4141..7abcc0bc 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
@@ -20,7 +20,12 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="name" title="账号别名" :min-width="100"/>
+        <vxe-column field="receiverNo" title="接收方编号" :min-width="180">
+          <template #default="{ row }">
+            <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
+          </template>
+        </vxe-column>
+        <vxe-column field="name" title="账号别名" :min-width="100" />
         <vxe-column field="channel" title="所属通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
@@ -38,21 +43,11 @@
             <a-tag>{{ dictConvert('AllocRelationType', row.relationType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="sync" title="是否同步" :min-width="100">
-          <template #default="{ row }">
-            <a-tag>{{ row.sync ? '已同步' : '未同步' }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column fixed="right" min-width="220" :showOverflow="false" title="操作">
+        <vxe-column fixed="right" min-width="100" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
             <a-divider type="vertical" />
-            <a-link @click="edit(row)">编辑</a-link>
-            <a-divider type="vertical" />
-            <a-link :disabled="row.sync" @click="remove(row)">删除</a-link>
-            <a-divider type="vertical" />
-            <a-link v-if="!row.sync" @click="bind(row)">同步</a-link>
-            <a-link v-else @click="unbind(row)">取消同步</a-link>
+            <a-link @click="remove(row)">删除</a-link>
           </template>
         </vxe-column>
       </vxe-table>
@@ -72,7 +67,7 @@
 <script setup lang="ts">
   import { computed, onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { del, findChannels, page, registerByGateway, removeByGateway } from './AllocationReceiver.api'
+  import { del, findChannels, page } from './AllocationReceiver.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -95,15 +90,14 @@
   const xToolbar = $ref<VxeToolbarInstance>()
 
   let payChannelList = $ref<LabeledValue[]>([])
-  let receiverTypeList = $ref<LabeledValue[]>([])
   let relationTypeList = $ref<LabeledValue[]>([])
 
   const fields = computed(() => {
     return [
+      { field: 'receiverNo', type: STRING, name: '接收方编号', placeholder: '请输入接收方编号' },
       { field: 'name', type: STRING, name: '账号别名', placeholder: '请输入账号别名' },
       { field: 'channel', type: LIST, name: '分账通道', placeholder: '请选择分账通道', selectList: payChannelList },
       { field: 'relationType', type: LIST, name: '分账关系', placeholder: '请选择分账关系', selectList: relationTypeList },
-      // { field: 'receiverType', type: LIST, name: '接收方类型', placeholder: '请选择分账接收方类型', selectList: receiverTypeList },
     ] as QueryField[]
   })
   onMounted(() => {
@@ -125,7 +119,6 @@
   async function initData() {
     findChannels().then(({ data }) => (payChannelList = data))
     relationTypeList = await dictDropDown('AllocationRelationType')
-    // receiverTypeList = await dictDropDown('AllocationReceiverType')
   }
 
   /**
@@ -168,11 +161,6 @@
    * 删除
    */
   function remove(record) {
-    // 判断是否未进行注册
-    if (record.sync) {
-      createMessage.warning('该接收方已同步到三方支付系统中,无法删除')
-      return
-    }
     createConfirm({
       iconType: 'warning',
       title: '警告',
@@ -186,42 +174,6 @@
       },
     })
   }
-
-  /**
-   * 同步到三方支付系统中
-   */
-  function bind(record) {
-    createConfirm({
-      iconType: 'info',
-      title: '警告',
-      content: '是否确认同步该条数据?',
-      onOk: () => {
-        loading.value = true
-        registerByGateway(record.id).then(({ data }) => {
-          createMessage.success('该分账接收方成功同步到三方支付系统中')
-          queryPage()
-        })
-      },
-    })
-  }
-
-  /**
-   * 从三方支付系统中删除
-   */
-  function unbind(record) {
-    createConfirm({
-      iconType: 'info',
-      title: '警告',
-      content: '是否确认取消同步该条数据?',
-      onOk: () => {
-        loading.value = true
-        removeByGateway(record.id).then(({ data }) => {
-          createMessage.success('该分账接收方从三方支付系统中取消成功')
-          queryPage()
-        })
-      },
-    })
-  }
 </script>
 
 <style scoped lang="less"></style>

From 19e2529a17b4fe7f85b14e198838ec60e861d92e Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 29 May 2024 18:17:48 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat=20=E5=88=86=E8=B4=A6=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/group/AllocationGroup.api.ts        |  4 ----
 .../allocation/group/AllocationGroupConfig.vue     |  1 -
 .../allocation/group/AllocationGroupSelect.vue     |  2 --
 .../allocation/order/AllocationOrderInfo.vue       |  8 --------
 .../allocation/receiver/AllocationReceiver.api.ts  |  2 --
 .../allocation/receiver/AllocationReceiverEdit.vue |  5 +----
 .../allocation/receiver/AllocationReceiverList.vue |  2 --
 .../payment/record/sync/PaySyncRecordInfo.vue      |  5 +++--
 .../payment/record/sync/PaySyncRecordList.vue      | 14 ++++++++++----
 9 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/views/payment/allocation/group/AllocationGroup.api.ts b/src/views/payment/allocation/group/AllocationGroup.api.ts
index 4b20e75b..18299d9f 100644
--- a/src/views/payment/allocation/group/AllocationGroup.api.ts
+++ b/src/views/payment/allocation/group/AllocationGroup.api.ts
@@ -170,10 +170,6 @@ export interface AllocationGroupReceiver extends BaseEntity {
    * 默认分账组
    */
   defaultGroup?: boolean
-  /**
-   * 接收方账号别名
-   */
-  name?: string
   /**
    * 分账比例
    */
diff --git a/src/views/payment/allocation/group/AllocationGroupConfig.vue b/src/views/payment/allocation/group/AllocationGroupConfig.vue
index 42d0ebfa..2561d97f 100644
--- a/src/views/payment/allocation/group/AllocationGroupConfig.vue
+++ b/src/views/payment/allocation/group/AllocationGroupConfig.vue
@@ -18,7 +18,6 @@
       @edit-activated="editActivatedEvent"
     >
       <vxe-column type="seq" width="60" />
-      <vxe-column field="name" title="账号别名" :min-width="100" />
       <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
           <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
diff --git a/src/views/payment/allocation/group/AllocationGroupSelect.vue b/src/views/payment/allocation/group/AllocationGroupSelect.vue
index d9cd776c..91b53952 100644
--- a/src/views/payment/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/payment/allocation/group/AllocationGroupSelect.vue
@@ -16,7 +16,6 @@
     <vxe-table row-id="id" ref="xTable" :height="350" :checkbox-config="checkboxConfig" :loading="loading" :data="pagination.records">
       <vxe-column type="checkbox" width="50" />
       <vxe-column field="receiverNo" title="接收方编号" :min-width="160" />
-      <vxe-column field="name" title="账号别名" :min-width="100" />
       <vxe-column field="receiverType" title="分账接收方类型" :min-width="100">
         <template #default="{ row }">
           <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
@@ -76,7 +75,6 @@
   const fields = computed(() => {
     return [
       { field: 'receiverNo', type: STRING, name: '接收方编号', placeholder: '请输入接收方编号' },
-      { field: 'name', type: STRING, name: '账号别名', placeholder: '请输入账号别名' },
       { field: 'relationType', type: LIST, name: '分账关系', placeholder: '请选择分账关系', selectList: relationTypeList },
     ] as QueryField[]
   })
diff --git a/src/views/payment/allocation/order/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
index 60130959..16d7576f 100644
--- a/src/views/payment/allocation/order/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -75,18 +75,10 @@
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   const {
-    initFormEditType,
     handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
     confirmLoading,
     visible,
-    editable,
     showable,
-    formEditType,
   } = useFormEdit()
   const { dictConvert } = useDict()
 
diff --git a/src/views/payment/allocation/receiver/AllocationReceiver.api.ts b/src/views/payment/allocation/receiver/AllocationReceiver.api.ts
index f4cdba15..3cdf5fd6 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiver.api.ts
+++ b/src/views/payment/allocation/receiver/AllocationReceiver.api.ts
@@ -86,8 +86,6 @@ export function del(id) {
  * 分账接收方
  */
 export interface AllocationReceiver extends BaseEntity {
-  // 账号别名
-  name?: string
   // 分账接收方编号
   receiverNo?: string
   // 所属通道
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue b/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue
index ec45bc81..9c199e0f 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverEdit.vue
@@ -24,9 +24,6 @@
         <a-form-item label="接收方编号" validate-first name="receiverNo">
           <a-input v-model:value="form.receiverNo" :disabled="!addable" placeholder="请输入接收方编号" />
         </a-form-item>
-        <a-form-item label="账号别名" name="name">
-          <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入账号别名" />
-        </a-form-item>
         <a-form-item label="所属通道" name="channel">
           <a-select
             style="width: 100%"
@@ -122,7 +119,7 @@
   const rules = computed(() => {
     return {
       receiverNo: [
-        { required: true, message: '请输入账号别名' },
+        { required: true, message: '请输入账号编号' },
         { trigger: 'blur', validator: validateCode },
       ],
       channel: [{ required: true, message: '请选择所属通道' }],
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverList.vue b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
index 7abcc0bc..1652eb64 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
@@ -25,7 +25,6 @@
             <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
           </template>
         </vxe-column>
-        <vxe-column field="name" title="账号别名" :min-width="100" />
         <vxe-column field="channel" title="所属通道" :min-width="100">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
@@ -95,7 +94,6 @@
   const fields = computed(() => {
     return [
       { field: 'receiverNo', type: STRING, name: '接收方编号', placeholder: '请输入接收方编号' },
-      { field: 'name', type: STRING, name: '账号别名', placeholder: '请输入账号别名' },
       { field: 'channel', type: LIST, name: '分账通道', placeholder: '请选择分账通道', selectList: payChannelList },
       { field: 'relationType', type: LIST, name: '分账关系', placeholder: '请选择分账关系', selectList: relationTypeList },
     ] as QueryField[]
diff --git a/src/views/payment/record/sync/PaySyncRecordInfo.vue b/src/views/payment/record/sync/PaySyncRecordInfo.vue
index 84d96f3d..f63c7c70 100644
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -26,8 +26,9 @@
           <a-tag> {{ dictConvert('AsyncPayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="同步结果" :span="2">
-          <a-tag v-if="form.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
-          <a-tag v-else>{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-else-if="row.syncType === 'refund'">{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-else>无</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复单号" :span="2">
           <a-tag v-if="form.repair" color="green"> {{ form.repairNo }} </a-tag>
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 53cf66ca..395213d1 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -15,7 +15,7 @@
           </template>
         </vxe-column>
         <vxe-column field="bizTradeNo" title="商户交易号" :min-width="220" />
-        <vxe-column field="channel" title="同步类型" :min-width="60">
+        <vxe-column field="channel" title="同步类型" :min-width="120">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PaymentType', row.syncType) }}</a-tag>
           </template>
@@ -28,7 +28,8 @@
         <vxe-column field="status" title="同步结果" :min-width="100">
           <template #default="{ row }">
             <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', row.outTradeStatus) }}</a-tag>
-            <a-tag v-else>{{ dictConvert('RefundSyncStatus', row.outTradeStatus) }}</a-tag>
+            <a-tag v-else-if="row.syncType === 'refund'">{{ dictConvert('RefundSyncStatus', row.outTradeStatus) }}</a-tag>
+            <a-tag v-else>无</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="repairOrder" title="是否修复" width="170">
@@ -57,9 +58,10 @@
       />
     </div>
     <pay-sync-record-info ref="paySyncRecordInfo" />
+    <pay-repair-record-info ref="payRepairRecordInfo" />
     <pay-order-info ref="payOrderInfo" />
     <refund-order-info ref="refundOrderInfo" />
-    <pay-repair-record-info ref="payRepairRecordInfo" />
+    <allocation-order-info ref="allocationOrderInfo" />
   </div>
 </template>
 
@@ -78,6 +80,7 @@
   import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
   import PayRepairRecordInfo from '/@/views/payment/record/repair/PayRepairRecordInfo.vue'
   import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
+  import AllocationOrderInfo from '/@/views/payment/allocation/order/AllocationOrderInfo.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
@@ -124,6 +127,7 @@
   const payOrderInfo = $ref<any>()
   const refundOrderInfo = $ref<any>()
   const payRepairRecordInfo = $ref<any>()
+  const allocationOrderInfo = $ref<any>()
 
   onMounted(() => {
     init()
@@ -169,8 +173,10 @@
   function showOrder(record) {
     if (record.syncType === 'pay') {
       payOrderInfo.init(record.tradeNo)
-    } else {
+    } else if (record.syncType === 'refund') {
       refundOrderInfo.init(record.tradeNo)
+    } else {
+      allocationOrderInfo.init(record.tradeNo)
     }
   }
 </script>

From 10f6e48b7a1e0b8ef0f1ffe6bbe1f165966f77bc Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 30 May 2024 20:59:43 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat=20=E5=88=86=E8=B4=A6=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/order/AllocationOrder.api.ts    | 18 ++++++++++++++----
 .../allocation/order/AllocationOrderInfo.vue   | 13 ++++++++++---
 .../allocation/order/AllocationOrderList.vue   |  4 ++--
 .../payment/order/refund/RefundOrder.api.ts    |  2 +-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/views/payment/allocation/order/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts
index a357037c..98fe3bd9 100644
--- a/src/views/payment/allocation/order/AllocationOrder.api.ts
+++ b/src/views/payment/allocation/order/AllocationOrder.api.ts
@@ -32,6 +32,16 @@ export function get(id) {
   })
 }
 
+/**
+ * 获取订单详细信息
+ */
+export function getOrderByAllocNo(allocNo: string) {
+  return defHttp.get<Result>({
+    url: '/order/allocation/findByAllocNo',
+    params: { allocNo },
+  })
+}
+
 /**
  * 扩展信息
  */
@@ -65,20 +75,20 @@ export function detail(id) {
 /**
  * 分账完结
  */
-export function finish(id) {
+export function finish(allocationNo) {
   return defHttp.post<Result<AllocationOrder>>({
     url: '/order/allocation/finish',
-    params: { id },
+    params: { allocationNo },
   })
 }
 
 /**
  * 分账完结
  */
-export function retry(id) {
+export function retry(bizAllocationNo) {
   return defHttp.post<Result<AllocationOrder>>({
     url: '/order/allocation/retry',
-    params: { id },
+    params: { bizAllocationNo },
   })
 }
 
diff --git a/src/views/payment/allocation/order/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
index 16d7576f..b84d7933 100644
--- a/src/views/payment/allocation/order/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -71,7 +71,12 @@
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { get, AllocationOrder } from './AllocationOrder.api'
+  import {
+    get,
+    AllocationOrder,
+    getOrderByAllocNo,
+    AllocationOrderExtra
+  } from './AllocationOrder.api'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
   const {
@@ -83,13 +88,15 @@
   const { dictConvert } = useDict()
 
   let order = $ref<AllocationOrder>({})
+  let orderExtra = $ref<AllocationOrderExtra>({})
   // 入口
   async function init(record: AllocationOrder) {
     visible.value = true
     order = record
     confirmLoading.value = true
-    await get(record.id).then(({ data }) => {
-      order = data
+    await getOrderByAllocNo(record.allocationNo as string).then(({ data }) => {
+      order = data.order
+      orderExtra = data.orderExtra
     })
     confirmLoading.value = false
   }
diff --git a/src/views/payment/allocation/order/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
index ada9ada4..ad73b933 100644
--- a/src/views/payment/allocation/order/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -199,7 +199,7 @@
       title: '分账重试',
       content: '确定分账重试吗？',
       onOk: () => {
-        retry(record.id).then(() => {
+        retry(record.bizAllocationNo).then(() => {
           createMessage.success('分账重试请求发送成功')
           queryPage()
         })
@@ -216,7 +216,7 @@
       title: '完结分账',
       content: '确定完结分账吗？',
       onOk: () => {
-        finish(record.id).then(() => {
+        finish(record.allocationNo).then(() => {
           createMessage.success('完结请求发送成功')
           queryPage()
         })
diff --git a/src/views/payment/order/refund/RefundOrder.api.ts b/src/views/payment/order/refund/RefundOrder.api.ts
index ea3eca02..d095c912 100644
--- a/src/views/payment/order/refund/RefundOrder.api.ts
+++ b/src/views/payment/order/refund/RefundOrder.api.ts
@@ -27,7 +27,7 @@ export function get(id) {
  */
 export function getByRefundNo(refundNo) {
   return defHttp.get<Result<any>>({
-    url: '/order/refund/findByOrderNo',
+    url: '/order/refund/findByRefundNo',
     params: { refundNo },
   })
 }

From 2e0ee31597bbba3a6ff7faf78f5307246b5930be Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Fri, 31 May 2024 17:42:10 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat=20=E5=88=86=E8=B4=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/order/AllocationOrderInfo.vue  | 34 +++++++++----------
 .../allocation/order/AllocationOrderList.vue  |  4 +--
 .../payment/record/sync/PaySyncRecordInfo.vue |  4 +--
 .../payment/record/sync/PaySyncRecordList.vue |  3 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/payment/allocation/order/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
index b84d7933..a7bdc6bd 100644
--- a/src/views/payment/allocation/order/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -52,6 +52,15 @@
         <a-descriptions-item label="完成时间" :span="2">
           {{ order.finishTime }}
         </a-descriptions-item>
+        <a-descriptions-item label="商户扩展参数" :span="2">
+          {{ orderExtra.attach }}
+        </a-descriptions-item>
+        <a-descriptions-item label="终端IP" :span="2">
+          {{ orderExtra.clientIp || '空' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通知地址" :span="4">
+          {{ orderExtra.notifyUrl }}
+        </a-descriptions-item>
         <a-descriptions-item v-if="order.errorCode" label="错误编码" :span="2">
           {{ order.errorMsg }}
         </a-descriptions-item>
@@ -71,32 +80,23 @@
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import {
-    get,
-    AllocationOrder,
-    getOrderByAllocNo,
-    AllocationOrderExtra
-  } from './AllocationOrder.api'
+  import { AllocationOrder, getOrderByAllocNo, AllocationOrderExtra } from './AllocationOrder.api'
   import { BasicModal } from '/@/components/Modal'
   import { useDict } from '/@/hooks/bootx/useDict'
-  const {
-    handleCancel,
-    confirmLoading,
-    visible,
-    showable,
-  } = useFormEdit()
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
 
   let order = $ref<AllocationOrder>({})
   let orderExtra = $ref<AllocationOrderExtra>({})
-  // 入口
-  async function init(record: AllocationOrder) {
+  /**
+   * 入口
+   */
+  async function init(allocationNo) {
     visible.value = true
-    order = record
     confirmLoading.value = true
-    await getOrderByAllocNo(record.allocationNo as string).then(({ data }) => {
+    await getOrderByAllocNo(allocationNo).then(({ data }) => {
       order = data.order
-      orderExtra = data.orderExtra
+      orderExtra = data.extra
     })
     confirmLoading.value = false
   }
diff --git a/src/views/payment/allocation/order/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
index ad73b933..0a88b906 100644
--- a/src/views/payment/allocation/order/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -66,7 +66,7 @@
                   <a-menu-item>
                     <a-link @click="syncInfo(row)">同步</a-link>
                   </a-menu-item>
-                  <a-menu-item v-if="row.status === 'allocation_end'">
+                  <a-menu-item v-if="['allocation_end', 'finish_failed'].includes(row.status)">
                     <a-link @click="finishInfo(row)">完结</a-link>
                   </a-menu-item>
                 </a-menu>
@@ -154,7 +154,7 @@
    * 查看
    */
   function show(record) {
-    allocationOrderInfo.init(record, FormEditType.Show)
+    allocationOrderInfo.init(record.allocationNo, FormEditType.Show)
   }
 
   /**
diff --git a/src/views/payment/record/sync/PaySyncRecordInfo.vue b/src/views/payment/record/sync/PaySyncRecordInfo.vue
index f63c7c70..687442bb 100644
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -26,8 +26,8 @@
           <a-tag> {{ dictConvert('AsyncPayChannel', form.channel) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="同步结果" :span="2">
-          <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
-          <a-tag v-else-if="row.syncType === 'refund'">{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-if="form.syncType === 'pay'">{{ dictConvert('PaySyncStatus', form.outTradeStatus) }}</a-tag>
+          <a-tag v-else-if="form.syncType === 'refund'">{{ dictConvert('RefundSyncStatus', form.outTradeStatus) }}</a-tag>
           <a-tag v-else>无</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复单号" :span="2">
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 395213d1..83a4d4c3 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -38,7 +38,7 @@
             <a-tag v-else>无需修复</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="errorMsg" title="错误消息" :min-width="160"/>
+        <vxe-column field="errorMsg" title="错误消息" :min-width="160" />
         <vxe-column field="createTime" title="同步时间" :min-width="160" />
         <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
           <template #default="{ row }">
@@ -81,6 +81,7 @@
   import PayRepairRecordInfo from '/@/views/payment/record/repair/PayRepairRecordInfo.vue'
   import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
   import AllocationOrderInfo from '/@/views/payment/allocation/order/AllocationOrderInfo.vue'
+  import ALink from '/@/components/Link/Link.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)

From f1c7aea7b5b4d979a3bcc3e95f46e3b64b51031e Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 2 Jun 2024 18:57:58 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat=20=E4=BA=A4=E6=98=93=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/flow/TradeFlowRecord.api.ts        |  43 +++++
 .../record/flow/TradeFlowRecordInfo.vue       |  76 +++++++++
 .../record/flow/TradeFlowRecordList.vue       | 160 ++++++++++++++++++
 .../payment/record/sync/PaySyncRecordList.vue |   2 +-
 4 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 src/views/payment/record/flow/TradeFlowRecord.api.ts
 create mode 100644 src/views/payment/record/flow/TradeFlowRecordInfo.vue
 create mode 100644 src/views/payment/record/flow/TradeFlowRecordList.vue

diff --git a/src/views/payment/record/flow/TradeFlowRecord.api.ts b/src/views/payment/record/flow/TradeFlowRecord.api.ts
new file mode 100644
index 00000000..934f9ed7
--- /dev/null
+++ b/src/views/payment/record/flow/TradeFlowRecord.api.ts
@@ -0,0 +1,43 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 分页
+ */
+export function page(params) {
+  return defHttp.get<Result<PageResult<TradeFlowRecord>>>({
+    url: '/record/flow/page',
+    params,
+  })
+}
+
+/**
+ * 获取单条
+ */
+export function get(id) {
+  return defHttp.get<Result<TradeFlowRecord>>({
+    url: '/record/flow/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 支付同步记录
+ */
+export interface TradeFlowRecord extends BaseEntity {
+  // 订单标题
+  title?: string
+  // 金额
+  amount?: number
+  // 业务类型
+  type?: string
+  // 同步通道
+  channel?: string
+  // 修复号
+  tradeNo?: string
+  // 商户交易号
+  bizTradeNo?: string
+  // 通道交易号
+  outTradeNo?: string
+}
diff --git a/src/views/payment/record/flow/TradeFlowRecordInfo.vue b/src/views/payment/record/flow/TradeFlowRecordInfo.vue
new file mode 100644
index 00000000..cf6383dd
--- /dev/null
+++ b/src/views/payment/record/flow/TradeFlowRecordInfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <basic-modal
+    title="查看同步信息"
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="1200"
+    :visible="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions title="" bordered>
+        <a-descriptions-item label="标题" :span="2">
+          {{ form.title }}
+        </a-descriptions-item>
+        <a-descriptions-item label="交易金额(元)" :span="2">
+          {{ form.amount ? (form.amount / 100).toFixed(2) : '无' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="本地交易号" :span="4">
+          {{ form.tradeNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="商户交易号" :span="4">
+          {{ form.bizTradeNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通道交易号" :span="4">
+          {{ form.outTradeNo || '无' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="流水类型" :span="2">
+          <a-tag>{{ dictConvert('TradeFlowRecordType', form.type) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="交易通道" :span="2">
+          <a-tag> {{ dictConvert('PayChannel', form.channel) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="同步时间" :span="2">
+          {{ form.createTime }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
+    <template #footer>
+      <a-button key="cancel" @click="handleCancel">取消</a-button>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import { $ref } from 'vue/macros'
+  import useFormEdit from '/@/hooks/bootx/useFormEdit'
+  import { get, TradeFlowRecord } from './TradeFlowRecord.api'
+  import { BasicModal } from '/@/components/Modal'
+  import { useDict } from '/@/hooks/bootx/useDict'
+
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
+  const { dictConvert } = useDict()
+
+  // 表单
+  let form = $ref<TradeFlowRecord>({})
+  // 入口
+  function init(id) {
+    visible.value = true
+    confirmLoading.value = true
+    get(id).then(({ data }) => {
+      form = data
+      confirmLoading.value = false
+    })
+  }
+
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped>
+  /deep/ .ant-descriptions-item-label {
+    width: 170px;
+  }
+</style>
diff --git a/src/views/payment/record/flow/TradeFlowRecordList.vue b/src/views/payment/record/flow/TradeFlowRecordList.vue
new file mode 100644
index 00000000..ff94ef6a
--- /dev/null
+++ b/src/views/payment/record/flow/TradeFlowRecordList.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query :query-params="model.queryParam" :default-item-count="3" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-column type="seq" title="序号" width="60" />
+        <vxe-column field="title" title="标题" :min-width="220" />
+        <vxe-column field="amount" title="金额(元)" :min-width="120" sortable>
+          <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }} </template>
+        </vxe-column>
+        <vxe-column field="type" title="流水类型" :min-width="120">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('TradeFlowRecordType', row.type) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="channel" title="交易通道" :min-width="100">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('AsyncPayChannel', row.channel) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="tradeNo" title="本地交易号" :min-width="220">
+          <template #default="{ row }">
+            <a @click="showOrder(row)">
+              {{ row.tradeNo }}
+            </a>
+          </template>
+        </vxe-column>
+        <vxe-column field="bizTradeNo" title="商户交易号" :min-width="220" />
+        <vxe-column field="outTradeNo" title="通道交易号" :min-width="220" />
+        <vxe-column field="createTime" title="时间" :min-width="160" sortable />
+        <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <span>
+              <a-link @click="show(row)">查看</a-link>
+            </span>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+    </div>
+    <trade-flow-record-info ref="tradeFlowRecordInfo" />
+    <pay-order-info ref="payOrderInfo" />
+    <refund-order-info ref="refundOrderInfo" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { computed, onMounted } from 'vue'
+  import { $ref } from 'vue/macros'
+  import { page } from './TradeFlowRecord.api'
+  import useTablePage from '/@/hooks/bootx/useTablePage'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
+  import { useDict } from '/@/hooks/bootx/useDict'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
+  import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
+  import ALink from '/@/components/Link/Link.vue'
+  import TradeFlowRecordInfo from './TradeFlowRecordInfo.vue'
+
+  // 使用hooks
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { notification, createMessage, createConfirm } = useMessage()
+  const { dictConvert, dictDropDown } = useDict()
+
+  let payChannelList = $ref<LabeledValue[]>([])
+  let tradeFlowRecordTypeList = $ref<LabeledValue[]>([])
+
+  // 查询条件
+  const fields = computed(() => {
+    return [
+      { field: 'title', type: STRING, name: '订单标题', placeholder: '请输入订单标题' },
+      { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' },
+      { field: 'bizTradeNo', type: STRING, name: '商户交易号', placeholder: '请输入商户交易号' },
+      { field: 'outTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' },
+      {
+        field: 'type',
+        type: LIST,
+        name: '流水类型',
+        placeholder: '请选择流水类型',
+        selectList: tradeFlowRecordTypeList,
+      },
+      {
+        field: 'channel',
+        type: LIST,
+        name: '交易通道',
+        placeholder: '请选择交易通道',
+        selectList: payChannelList,
+      },
+    ] as QueryField[]
+  })
+
+  const xTable = $ref<VxeTableInstance>()
+  const xToolbar = $ref<VxeToolbarInstance>()
+  const payOrderInfo = $ref<any>()
+  const refundOrderInfo = $ref<any>()
+  const tradeFlowRecordInfo = $ref<any>()
+
+  onMounted(() => {
+    init()
+    vxeBind()
+    queryPage()
+  })
+  function vxeBind() {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  }
+
+  /**
+   * 初始化
+   */
+  async function init() {
+    tradeFlowRecordTypeList = await dictDropDown('TradeFlowRecordType')
+    payChannelList = await dictDropDown('PayChannel')
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+  /**
+   * 查看
+   */
+  function show(record) {
+    tradeFlowRecordInfo.init(record.id)
+  }
+
+  /**
+   * 查看支付单信息
+   */
+  function showOrder(record) {
+    if (record.type === 'pay') {
+      payOrderInfo.init(record.tradeNo)
+    } else if (record.type === 'refund') {
+      refundOrderInfo.init(record.tradeNo)
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 83a4d4c3..f55148e0 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -97,7 +97,7 @@
     return [
       { field: 'tradeNo', type: STRING, name: '本地交易号', placeholder: '请输入本地交易号' },
       { field: 'bizTradeNo', type: STRING, name: '商户交易号', placeholder: '请输入商户交易号' },
-      { field: 'bizTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' },
+      { field: 'outTradeNo', type: STRING, name: '通道交易号', placeholder: '请输入通道交易号' },
       {
         field: 'syncType',
         type: LIST,