From 2ba4b5952aed8356da2d41e3f6b711d4a61c656d Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 02 四月 2025 16:49:46 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 4442a58..ed8c787 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -607,9 +607,9 @@
return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
}
- public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)
{
- return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
+ return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue,x => x.Status == input.Status).ToListAsync();
}
public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -1314,6 +1314,7 @@
order.PayStatus = LifePayStatusEnum.宸叉敮浠�;
order.PayTime = DateTime.Now;
order.OutOrderNo = outOrderNo;
+
try
{
var result = (Code: "Fail", RequestNo: "", ACOOLYOrderNo: "");
@@ -1338,6 +1339,10 @@
order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
order.ACOOLYOrderNo = result.ACOOLYOrderNo;
order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�间腑;
+
+ /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+ await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
+ order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
}
catch (Exception ex)
{
@@ -1411,6 +1416,7 @@
if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
{
+ ///缁撶畻娓犻亾浣ｉ噾
/// 姣涘埄
var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100;
/// 娓犻亾浣ｉ噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
@@ -1420,15 +1426,19 @@
LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
{
OrderNo = order.OrderNo,
- PayAmount = order.PayAmount.Value,
- ChannlesRakeRate = order.ChannlesRakeRate.Value,
- ChannlesRakePrice = channlesRakePrice.Value,
+ PayAmount = order.RechargeAmount ?? 0,
+ ChannlesRakeRate = order.ChannlesRakeRate ?? 0,
+ ChannlesRakePrice = channlesRakePrice ?? 0,
FinishTime = order.FinishTime.Value,
ChannelId = order.ChannelId,
};
await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
}
}
+
+ /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+ await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,
+ order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
}
/// <summary>
@@ -1664,17 +1674,6 @@
userAccount.DeletionTime = DateTime.Now;
userAccount.IsDeleted = true;
- /// 娓呴櫎鎴峰彿瀵瑰簲鐨勭敤鎴峰鍚�
- if (userAccount.LifePayType == LifePayOrderTypeEnum.PhoneOrder || userAccount.LifePayType == LifePayOrderTypeEnum.ElectricOrder)
- {
- var user = await _lifePayUserRepository.Where(r => r.Id == userAccount.UserId && !r.IsDeleted).FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "鐢ㄦ埛涓嶅瓨鍦�");
- var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(userAccount.ExtraProperties);
- if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
- {
- user.Name = string.Empty;
- }
- }
return Constant.SUCCESS;
}
@@ -1709,7 +1708,7 @@
#region 璁板綍鏃ュ織
- await LifePayOrderHistory("閫�娆鹃┏鍥�", "閫�娆�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
+ await LifePayOrderHistory("閫�娆鹃┏鍥�", "閫�娆鹃┏鍥�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
#endregion
}
else
@@ -2225,7 +2224,7 @@
var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;
/// 鍒╂鼎
- var profit = grossProfit - channlesRakePrice - (premiumRate);
+ var profit = grossProfit - channlesRakePrice - premiumPrice;
return new OrderPriceReturn()
{
--
Gitblit v1.9.1