From 1c5d47ed2fb8e2dac617676ac1f489cc6e3483af Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 09 六月 2025 10:21:29 +0800
Subject: [PATCH] feat:1.4相关修改
---
LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelConsultationFollowupStatus.cs | 13 +++++++++----
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 12 +++++++-----
LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelAgentType.cs | 4 ++++
LifePayment/LifePayment.Application.Contracts/Promoter/PromoterDto.cs | 14 ++++++++++++++
4 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/Promoter/PromoterDto.cs b/LifePayment/LifePayment.Application.Contracts/Promoter/PromoterDto.cs
index 9878470..6aa1ea4 100644
--- a/LifePayment/LifePayment.Application.Contracts/Promoter/PromoterDto.cs
+++ b/LifePayment/LifePayment.Application.Contracts/Promoter/PromoterDto.cs
@@ -9,6 +9,20 @@
{
public class GetPromotersInput : PageInput
{
+ /// <summary>
+ /// 鍒涘缓鐨勫紑濮嬫椂闂�
+ /// </summary>
+ public DateTime? StartDate { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鐨勭粨鏉熸椂闂�
+ /// </summary>
+ public DateTime? EndDate { get; set; }
+
+ /// <summary>
+ /// 鎼滅储鍏抽敭璇�
+ /// </summary>
+ public string SearchKey { get; set; }
}
public class PromoterDto
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index dbbcb41..0aef80f 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1376,12 +1376,12 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- {
- return;
- }
+ //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+ //{
+ // return;
+ //}
- //order.PlatformDeductionAmount = payAmount;
+ order.ActualReceivedAmount = actualParValue;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
@@ -1404,6 +1404,8 @@
|| order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
{
order.FinishTime = DateTime.Now;
+ order.PlatformDeductionAmount = order.ActualReceivedAmount * order.PlatformRate / 100;
+ order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2);
}
await _lifePayOrderRepository.UpdateAsync(order);
diff --git a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelAgentType.cs b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelAgentType.cs
index 0c3622b..8b7d65d 100644
--- a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelAgentType.cs
+++ b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelAgentType.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -14,16 +15,19 @@
/// <summary>
/// 闆跺敭浠ｇ悊
/// </summary>
+ [Description("闆跺敭浠ｇ悊")]
RetailAgent = 1,
/// <summary>
/// 鍝佺墝浠ｇ悊
/// </summary>
+ [Description("鍝佺墝浠ｇ悊")]
BrandAgent = 2,
/// <summary>
/// 鍖哄煙浠ｇ悊
/// </summary>
+ [Description("鍖哄煙浠ｇ悊")]
AreaAgent = 3
}
}
diff --git a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelConsultationFollowupStatus.cs b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelConsultationFollowupStatus.cs
index d7681d8..9fa6abe 100644
--- a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelConsultationFollowupStatus.cs
+++ b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayChannelConsultationFollowupStatus.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -11,21 +12,25 @@
/// <summary>
/// 鏈洖璁�
/// </summary>
- None = 0,
+ [Description("鏈洖璁�")]
+ None = 1,
/// <summary>
/// 璺熻繘涓�
/// </summary>
- Ing = 1,
+ [Description("璺熻繘涓�")]
+ Ing = 2,
/// <summary>
/// 宸叉嫆缁�
/// </summary>
- Refuse = 1,
+ [Description("宸叉嫆缁�")]
+ Refuse = 3,
/// <summary>
/// 宸插紑閫�
/// </summary>
- Open = 1,
+ [Description("宸插紑閫�")]
+ Open = 4,
}
}
--
Gitblit v1.9.1