diff --git a/src/enums/daxpay/TradeStatusEnum.ts b/src/enums/daxpay/TradeStatusEnum.ts
new file mode 100644
index 000000000..022efc970
--- /dev/null
+++ b/src/enums/daxpay/TradeStatusEnum.ts
@@ -0,0 +1,102 @@
+/**
+ * 支付状态
+ */
+export enum PayStatusEnum{
+ /**
+ * 支付中
+ */
+ PROGRESS = 'progress',
+ /**
+ * 成功
+ */
+ SUCCESS = 'success',
+ /**
+ * 支付关闭
+ */
+ CLOSE = 'close',
+ /**
+ * 支付撤销
+ */
+ CANCEL = 'cancel',
+ /**
+ * 失败
+ */
+ FAIL = 'fail',
+ /**
+ * 支付超时
+ */
+ TIMEOUT = 'timeout',
+}
+
+/**
+ * 支付订单的退款状态
+ */
+export enum PayRefundStatusEnum{
+ /**
+ * 未退款
+ */
+ NO_REFUND = 'no_refund',
+ /**
+ * 退款中
+ */
+ REFUNDING = 'refunding',
+ /**
+ * 部分退款
+ */
+ PARTIAL_REFUND = 'partial_refund',
+ /**
+ * 全部退款
+ */
+ REFUNDED = 'refunded',
+}
+
+/**
+ * 支付订单的分账状态
+ */
+export enum PayAllocStatusEnum{
+
+ /**
+ * 待分账
+ */
+ WAITING = 'waiting',
+ /**
+ * 已分账
+ */
+ ALLOCATION = 'allocation',
+}
+
+/**
+ * 退款状态枚举
+ */
+export enum RefundStatusEnum{
+ /**
+ * 退款中
+ */
+ PROGRESS = 'progress',
+ /**
+ * 成功
+ */
+ SUCCESS = 'success',
+ /**
+ * 关闭
+ */
+ CLOSE = 'close',
+ /**
+ * 失败
+ */
+ FAIL = 'fail',
+}
+
+/**
+ * 转账状态
+ */
+export enum TransferStatusEnum{
+ /** 转账中 */
+ PROGRESS = 'progress',
+ /** 转账成功 */
+ SUCCESS = 'success',
+ /** 转账关闭 */
+ FAIL = 'fail',
+ /** 转账失败 */
+ CLOSE = 'close',
+}
diff --git a/src/views/daxpay/admin/order/pay/PayOrder.api.ts b/src/views/daxpay/admin/order/pay/PayOrder.api.ts
index f061cde17..2105e8be5 100644
--- a/src/views/daxpay/admin/order/pay/PayOrder.api.ts
+++ b/src/views/daxpay/admin/order/pay/PayOrder.api.ts
@@ -1,6 +1,11 @@
import { defHttp } from '@/utils/http/axios'
import { PageResult, Result } from '#/axios'
import { MchEntity } from '#/web'
+import {
+ PayAllocStatusEnum,
+ PayRefundStatusEnum,
+ PayStatusEnum,
+} from '@/enums/daxpay/TradeStatusEnum'
/**
* 分页
@@ -72,6 +77,55 @@ export function getTotalAmount(param) {
})
}
+/**
+ * 显示样式优化
+ */
+export function cellStyle({ row, column }) {
+ // 支付状态
+ if (column.field == 'status') {
+ switch (row.status) {
+ case PayStatusEnum.SUCCESS:
+ return { color: 'green' }
+ case PayStatusEnum.FAIL:
+ return { color: 'red' }
+ case PayStatusEnum.PROGRESS:
+ return { color: 'orange' }
+ case PayStatusEnum.CLOSE:
+ return { color: 'gray' }
+ case PayStatusEnum.CANCEL:
+ return { color: 'gray' }
+ default:
+ return { color: 'red' }
+ }
+ }
+ // 分账状态
+ if (column.field == 'allocStatus') {
+ switch (row.allocStatus) {
+ case PayAllocStatusEnum.WAITING:
+ return { color: 'orange' }
+ case PayAllocStatusEnum.ALLOCATION:
+ return { color: 'green' }
+ default:
+ return { color: 'red' }
+ }
+ }
+ // 退款状态
+ if (column.field == 'refundStatus') {
+ switch (row.refundStatus) {
+ case PayRefundStatusEnum.NO_REFUND:
+ return { color: 'gray' }
+ case PayRefundStatusEnum.REFUNDED:
+ return { color: 'green' }
+ case PayRefundStatusEnum.REFUNDING:
+ return { color: 'orange' }
+ case PayRefundStatusEnum.PARTIAL_REFUND:
+ return { color: 'gray' }
+ default:
+ return { color: 'red' }
+ }
+ }
+}
+
/**
* 支付记录
*/
diff --git a/src/views/daxpay/admin/order/pay/PayOrderInfo.vue b/src/views/daxpay/admin/order/pay/PayOrderInfo.vue
index 46f2d2e38..dc352b77a 100644
--- a/src/views/daxpay/admin/order/pay/PayOrderInfo.vue
+++ b/src/views/daxpay/admin/order/pay/PayOrderInfo.vue
@@ -20,22 +20,22 @@
{{ order.refundableBalance }}
- {{ dictConvert('PayStatus', order.status) }}
+ {{ dictConvert('pay_status', order.status) }}
{{ order.orderNo }}
- {{ dictConvert('PayOrderAllocStatus', order.allocStatus) || '无' }}
+ {{ dictConvert('pay_alloc_status', order.allocStatus) || '无' }}
{{ order.outOrderNo || '无' }}
- {{ dictConvert('PayOrderRefundStatus', order.refundStatus) || '无' }}
+ {{ dictConvert('pay_refund_status', order.refundStatus) || '无' }}
- {{ dictConvert('PayOrderRefundStatus', order.refundStatus) || '无' }}
+ {{ order.bizOrderNo || '无' }}
{{ order.autoAllocation || '无' }}
diff --git a/src/views/daxpay/admin/order/pay/PayOrderList.vue b/src/views/daxpay/admin/order/pay/PayOrderList.vue
index 0d53f9814..77592fe24 100644
--- a/src/views/daxpay/admin/order/pay/PayOrderList.vue
+++ b/src/views/daxpay/admin/order/pay/PayOrderList.vue
@@ -55,9 +55,9 @@
dictConvert('pay_status', row.status) || '无'
}}
-
+
{{
- dictConvert('pay_order_refund_status', row.refundStatus) || '无'
+ dictConvert('pay_refund_status', row.refundStatus) || ''
}}
@@ -68,7 +68,7 @@
- {{ dictConvert('PayOrderAllocStatus', row.allocStatus) || '无' }}
+ {{ dictConvert('pay_alloc_status', row.allocStatus) || '无' }}
@@ -83,22 +83,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 同步
+
+
+ 关闭
+
+
+ 分账
+
+
+ 退款
+
@@ -115,16 +120,25 @@
@page-change="handleTableChange"
/>
+
diff --git a/src/views/daxpay/admin/order/pay/RefundModel.vue b/src/views/daxpay/admin/order/pay/RefundModel.vue
new file mode 100644
index 000000000..02f0128f6
--- /dev/null
+++ b/src/views/daxpay/admin/order/pay/RefundModel.vue
@@ -0,0 +1,120 @@
+
+
+
+
+ {{ order.title }}
+
+
+ {{ order.orderNo }}
+
+
+ {{ order.bizOrderNo }}
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/admin/order/refund/RefundOrder.api.ts b/src/views/daxpay/admin/order/refund/RefundOrder.api.ts
index 578436adc..a937ad714 100644
--- a/src/views/daxpay/admin/order/refund/RefundOrder.api.ts
+++ b/src/views/daxpay/admin/order/refund/RefundOrder.api.ts
@@ -37,7 +37,7 @@ export function getByRefundNo(refundNo) {
*/
export function refund(params) {
return defHttp.post>({
- url: '/order/refund/refund',
+ url: '/order/refund/create',
data: params,
})
}
diff --git a/src/views/daxpay/admin/order/refund/RefundOrderList.vue b/src/views/daxpay/admin/order/refund/RefundOrderList.vue
index cbb9a9bae..c47375736 100644
--- a/src/views/daxpay/admin/order/refund/RefundOrderList.vue
+++ b/src/views/daxpay/admin/order/refund/RefundOrderList.vue
@@ -15,7 +15,7 @@
退款金额: {{ totalAmount ? totalAmoun : 0 }}元退款金额: {{ totalAmount ? totalAmount : 0 }}元
@@ -48,7 +48,7 @@
- {{ dictConvert('PayChannel', row.channel) }}
+ {{ dictConvert('channel', row.channel) }}
@@ -58,7 +58,7 @@
- {{ dictConvert('RefundStatus', row.status) }}
+ {{ dictConvert('refund_status', row.status) }}
@@ -138,7 +138,7 @@
field: 'outOrderNo',
type: STRING,
name: '通道订单号',
- placeholder: '请输入三方支付的通道订单号',
+ placeholder: '请输入通道订单号',
},
{ field: 'title', type: STRING, name: '原支付标题', placeholder: '请输入原支付标题' },
{ field: 'errorCode', name: '错误码', type: STRING },