From 715971f988d2d096b32a699f10f5c9acdadcae1c Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 13:08:32 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 8 ++++++--
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 6 ++++++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 9 +++++----
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 845117b..8670fc7 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -252,15 +252,19 @@
public string RefundCheckRemark { get; set; }
/// <summary>
- /// 骞冲彴璁㈠崟鍙�
+ /// 渚涘簲鍟嗚鍗曞彿
/// </summary>
public string ACOOLYOrderNo { get; set; }
/// <summary>
- /// 渚涘簲鍟�
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
/// </summary>
public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
}
public class LifePayOrderListTemplate
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 00e2476..0fed01f 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -257,7 +257,8 @@
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.ActualRechargeAmount,
PlatformDeductionAmount = a.PlatformDeductionAmount,
- ACOOLYStatus = a.ACOOLYStatus
+ ACOOLYStatus = a.ACOOLYStatus,
+ LifePayRefundStatus = a.LifePayRefundStatus,
}).GetPageResult(input.PageModel);
return result;
@@ -552,7 +553,7 @@
var orderInput = new CreateLifePayOrderInput
{
- OrderNo = CreateOrderNo(),
+ OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
//LifePayType = input.LifePayType,
@@ -596,7 +597,7 @@
var orderInput = new CreateLifePayOrderInput
{
- OrderNo = CreateOrderNo(),
+ OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
// LifePayType = input.LifePayType,
@@ -640,7 +641,7 @@
var orderInput = new CreateLifePayOrderInput
{
- OrderNo = CreateOrderNo(),
+ OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
// LifePayType = input.LifePayType,
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index 3a90b90..954b7b0 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -131,8 +131,14 @@
public Guid? RefundCheckUserId { get; set; }
public string? ChannelId { get; set; }
+
/// 瀹為檯鍏呭�奸噾棰�
/// </summary>
public decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1