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] =?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 a357037cc..98fe3bd9f 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 16d7576f1..b84d79339 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 ada9ada40..ad73b933e 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 ea3eca029..d095c9126 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 },
   })
 }