From 9ae09cab250590a8b6a5e7bd33139578f5200011 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 10:27:25 +0800
Subject: [PATCH] Merge branch 'master' into dev-lifepay-v1.3
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index f944c9a..16a9684 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -377,6 +377,12 @@
[Name("骞冲彴閫�娆剧姸鎬�")]
public string? LifePayRefundStatusStr { get; set; }
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ [Name("骞冲彴璁㈠崟鐘舵��")]
+ public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
@@ -406,8 +412,8 @@
///// </summary>
//public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
- //[Name("璁㈠崟鐘舵��")]
- //public string LifePayOrderStatusStr { get; set; }
+ [Name("骞冲彴璁㈠崟鐘舵��")]
+ public string LifePayOrderStatusStr { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -418,8 +424,6 @@
public string FinishTimeStr { get; set; }
-
-
}
@@ -1096,4 +1100,12 @@
public class ChannelRateOutput
{
public decimal ChannlesRate { get; set; }
+}
+
+public class OnlineServiceInput
+{
+ /// <summary>
+ /// 鍦ㄧ嚎瀹㈡湇閾炬帴
+ /// </summary>
+ public string Link { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.1