From d5fe1b8b4de07a9ceeee5bba65677f5c0b5e9d5d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 31 三月 2025 10:14:56 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3
---
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index f6c1394..c9899cf 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -36,19 +36,19 @@
/// <summary>
/// 鍏呭�奸噾棰�
/// </summary>
- public decimal RechargeAmount { get; set; }
+ public decimal? RechargeAmount { get; set; }
/// <summary>
/// 浼樻儬閲戦
/// </summary>
- public decimal DiscountAmount { get; set; }
+ public decimal? DiscountAmount { get; set; }
/// <summary>
/// 瀹炰粯閲戦
/// </summary>
- public decimal PayAmount { get; set; }
+ public decimal? PayAmount { get; set; }
/// <summary>
/// 骞冲彴鎵ｆ閲戦
@@ -63,7 +63,7 @@
/// <summary>
/// 鏀粯鐘舵��
/// </summary>
- public LifePayStatusEnum PayStatus { get; set; }
+ public LifePayStatusEnum? PayStatus { get; set; }
/// <summary>
/// 澶栭儴璁㈠崟鍙�
@@ -73,7 +73,7 @@
/// <summary>
/// 閫�娆捐鍗曞彿
/// </summary>
- public string? RefundOrderNo { get; set; }
+ public string RefundOrderNo { get; set; }
/// <summary>
/// 娓犻亾娴佹按鍙�
@@ -83,7 +83,7 @@
/// <summary>
/// 骞冲彴璁㈠崟鐘舵��
/// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; }
/// <summary>
/// 渚涘簲鍟嗙姸鎬�
@@ -135,7 +135,7 @@
/// </summary>
public Guid? RefundCheckUserId { get; set; }
- public string? ChannelId { get; set; }
+ public string ChannelId { get; set; }
/// <summary>
/// 閫�娆鹃噾棰�
@@ -160,12 +160,12 @@
/// <summary>
/// 鍥炲崟鍦板潃
/// </summary>
- public string? ElecBillUrl { get; set; }
+ public string ElecBillUrl { get; set; }
/// <summary>
/// 閫�娆惧洖鍗曞湴鍧�
/// </summary>
- public string? RefundElecBillUrl { get; set; }
+ public string RefundElecBillUrl { get; set; }
/// <summary>
--
Gitblit v1.9.1