From fa5d4bbca40f93bac208e698de11cef7c3a89e2d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 21 三月 2025 17:20:02 +0800
Subject: [PATCH] fix: 三期需求
---
packages/components/src/utils/common.ts | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/packages/components/src/utils/common.ts b/packages/components/src/utils/common.ts
index cece529..c4a3b14 100644
--- a/packages/components/src/utils/common.ts
+++ b/packages/components/src/utils/common.ts
@@ -132,7 +132,7 @@
lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum
) {
if (
- (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
+ (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑 &&
payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
) {
@@ -152,10 +152,11 @@
export function convertOrderFrontStatus(
payStatus?: LifeRechargeConstants.LifePayStatusEnum,
- lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum
+ lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum,
+ lifePayRefundStatus?: LifeRechargeConstants.LifePayRefundStatusEnum
) {
if (
- (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
+ (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑 &&
payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
) {
@@ -167,10 +168,13 @@
) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.宸查��娆�;
}
- if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳) {
+ if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呴��娆�) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧緟瀹℃牳;
}
- if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐�) {
+ if (
+ lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐� ||
+ lifePayRefundStatus === LifeRechargeConstants.LifePayRefundStatusEnum.閫�娆鹃┏鍥�
+ ) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�;
}
if (
--
Gitblit v1.9.1