From b11477657850db16d375f4789439a61e4cfa1a4a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 25 三月 2025 17:08:12 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
packages/components/src/utils/common.ts | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/packages/components/src/utils/common.ts b/packages/components/src/utils/common.ts
index 8ec6d2a..5b055b6 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,22 +152,29 @@
export function convertOrderFrontStatus(
payStatus?: LifeRechargeConstants.LifePayStatusEnum,
- lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum
+ lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum,
+ lifePayRefundStatus?: LifeRechargeConstants.LifePayRefundStatusEnum
) {
+ // if (
+ // (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑 &&
+ // payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
+ // payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
+ // ) {
+ // return LifeRechargeConstants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛;
+ // }
if (
- (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
- payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
- payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
+ lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.宸查��娆� ||
+ payStatus === LifeRechargeConstants.LifePayStatusEnum.宸查��娆�
) {
- return LifeRechargeConstants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛;
- }
- if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.宸查��娆�) {
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 (
@@ -176,5 +183,5 @@
) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔�;
}
- return;
+ return LifeRechargeConstants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛;
}
--
Gitblit v1.9.1