From efef23b91cfcdf3e242258876b2b4ae8abb8fb7e Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 13:39:15 +0800
Subject: [PATCH] fix:支持在配置文件中配置是否开启1分钱支付
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 379 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 217 insertions(+), 162 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index f9b0fca..f932280 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -27,6 +27,7 @@
using Volo.Abp.ObjectMapping;
using NPOI.SS.Formula.Functions;
using StackExchange.Redis;
+using static Volo.Abp.Identity.Settings.IdentitySettingNames;
namespace LifePayment.Application;
@@ -50,6 +51,7 @@
private readonly IAlipayInterfaceManager _alipayInterfaceManager;
private readonly IWxPayApi _wxPayApi;
private readonly WxPayOption _wxPayOptions;
+ private readonly InitSetting _initSettingOptions;
private readonly IACOOLYManager _aCOOLYManager;
@@ -66,6 +68,7 @@
IAlipayInterfaceManager aliPayInterfaceManager,
IWxPayApi wxPayApi,
IOptions<WxPayOption> wxPayOptions,
+ IOptions<InitSetting> initSettingOptions,
IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayAccount, Guid> lifePayAccount,
IDataFilter dataFilter,
@@ -82,6 +85,7 @@
_alipayInterfaceManager = aliPayInterfaceManager;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
+ _initSettingOptions = initSettingOptions.Value;
_distributedEventBus = distributedEventBus;
_lifePayChannlesRep = lifePayChannlesRep;
_lifePayAccount = lifePayAccount;
@@ -157,7 +161,7 @@
/// <returns></returns>
public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
{
- return _lifePayChannlesRep.Where(x => x.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
+ return _lifePayChannlesRep.Where(x => x.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
.FirstOrDefault();
}
@@ -246,6 +250,7 @@
{
var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+ .Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -261,19 +266,19 @@
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
- DiscountAmount = a.DiscountAmount,
+ DiscountAmount = a.DiscountAmount ?? 0,
FinishTime = a.FinishTime,
Id = a.Id,
- LifePayOrderStatus = a.LifePayOrderStatus,
+ LifePayOrderStatus = a.LifePayOrderStatus?? 0,
LifePayOrderType = a.LifePayOrderType,
LifePayType = a.LifePayType,
OrderNo = a.OrderNo,
- PayAmount = a.PayAmount,
+ PayAmount = a.PayAmount ?? 0,
PhoneNumber = a.PhoneNumber,
- RechargeAmount = a.RechargeAmount,
+ RechargeAmount = a.RechargeAmount??0,
UserId = a.UserId,
OutOrderNo = a.OutOrderNo,
- PayStatus = a.PayStatus,
+ PayStatus = a.PayStatus?? 0,
PayTime = a.PayTime,
ACOOLYOrderNo = a.ACOOLYOrderNo,
RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
@@ -317,19 +322,19 @@
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
- DiscountAmount = a.DiscountAmount,
+ DiscountAmount = a.DiscountAmount ?? 0,
FinishTime = a.FinishTime,
Id = a.Id,
- LifePayOrderStatus = a.LifePayOrderStatus,
+ LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
LifePayOrderType = a.LifePayOrderType,
LifePayType = a.LifePayType,
OrderNo = a.OrderNo,
- PayAmount = a.PayAmount,
+ PayAmount = a.PayAmount ?? 0,
PhoneNumber = a.PhoneNumber,
- RechargeAmount = a.RechargeAmount,
+ RechargeAmount = a.RechargeAmount ?? 0,
UserId = a.UserId,
OutOrderNo = a.OutOrderNo,
- PayStatus = a.PayStatus,
+ PayStatus = a.PayStatus ?? 0,
PayTime = a.PayTime,
ACOOLYOrderNo = a.ACOOLYOrderNo,
RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
@@ -337,6 +342,7 @@
RefundCheckRemark = a.RefundCheckRemark,
RefundApplyRemark = a.RefundApplyRemark,
RefundApplyTime = a.RefundApplyTime,
+ RefundOrderNo = a.RefundOrderNo,
RefundTime = a.RefundTime,
RefundPrice = a.RefundPrice,
ChannelName = b.ChannlesName,
@@ -365,6 +371,7 @@
PayAmount = x.PayAmount,
PhoneNumber = x.PhoneNumber,
RefundOrderNo = x.RefundOrderNo,
+ RefundApplyTime = x.RefundApplyTime,
ChannelName = x.ChannelName,
CreationTime = x.CreationTime,
ACOOLYStatus = x.ACOOLYStatus,
@@ -382,10 +389,11 @@
s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
s.ActualReceivedAmount = s.ActualReceivedAmount;
- s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();
+ s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
s.PayAmountStr = s.PayAmount.ToString("F2");
s.LifePayTypeStr = s.LifePayType.GetDescription();
s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
+ s.RefundApplyTimeStr = !s.RefundApplyTime.HasValue ? string.Empty : s.RefundApplyTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
});
return result;
}
@@ -395,28 +403,27 @@
{
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
- CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
- var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
- var orderpirce = await GetOrderPrice(order.RechargeAmount, order.PayAmount,order.PlatformRate, order.ChannleRate, order.ChannlesRakeRate,order.PremiumRate);
-
+ CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "鐢ㄦ埛涓嶅瓨鍦�");
+ var orderpirce = await GetOrderPrice(order.RechargeAmount ?? 0, order.PayAmount ?? 0, order.PlatformRate ?? 0, order.ChannleRate ?? 0, order.ChannlesRakeRate ?? 0, order.PremiumRate ?? 0);
var result = new LifePayOrderOutput()
- {
+ {
UserName = user.Name,
UserPhoneNumber = user.PhoneNumber,
- DiscountAmount = order.DiscountAmount,
+ DiscountAmount = order.DiscountAmount ?? 0,
FinishTime = order.FinishTime,
Id = order.Id,
OutOrderNo = order.OutOrderNo,
LifePayChannle = channle.ChannlesName,
- Status = order.LifePayOrderStatus,
+ Status = order.LifePayOrderStatus ?? 0,
LifePayOrderType = order.LifePayOrderType,
LifePayType = order.LifePayType,
OrderNo = order.OrderNo,
- PayAmount = order.PayAmount,
- RechargeAmount = order.RechargeAmount,
- PayStatus = order.PayStatus,
+ PayAmount = order.PayAmount ?? 0,
+ RechargeAmount = order.RechargeAmount ?? 0,
+ PayStatus = order.PayStatus ?? 0,
PayTime = order.PayTime,
OrderParamDetailJsonStr = order.OrderParamDetailJsonStr,
RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
@@ -437,7 +444,8 @@
ChannlesRakePrice = orderpirce.ChannlesRakePrice,
PremiumRate = order.PremiumRate,
PremiumPrice = orderpirce.PremiumPrice,
- Profit = orderpirce.Profit
+ Profit = orderpirce.Profit,
+ RefundOrderNo = order.RefundOrderNo,
};
return result;
@@ -457,18 +465,18 @@
{
UserName = user.Name,
UserPhoneNumber = user.PhoneNumber,
- DiscountAmount = order.DiscountAmount,
+ DiscountAmount = order.DiscountAmount ?? 0,
FinishTime = order.FinishTime,
Id = order.Id,
OutOrderNo = order.OutOrderNo,
LifePayChannle = channle.ChannlesName,
- Status = order.LifePayOrderStatus,
+ Status = order.LifePayOrderStatus ?? 0,
LifePayOrderType = order.LifePayOrderType,
LifePayType = order.LifePayType,
OrderNo = order.OrderNo,
- PayAmount = order.PayAmount,
- RechargeAmount = order.RechargeAmount,
- PayStatus = order.PayStatus,
+ PayAmount = order.PayAmount ?? 0,
+ RechargeAmount = order.RechargeAmount ?? 0,
+ PayStatus = order.PayStatus ?? 0,
PayTime = order.PayTime,
RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
CreationTime = order.CreationTime,
@@ -513,16 +521,16 @@
.Select(x =>
new UserLifePayOrderOutput
{
- DiscountAmount = x.DiscountAmount,
+ DiscountAmount = x.DiscountAmount ?? 0,
FinishTime = x.FinishTime,
Id = x.Id,
- LifePayOrderStatus = x.LifePayOrderStatus,
+ LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
LifePayOrderType = x.LifePayOrderType,
LifePayType = x.LifePayType,
OrderNo = x.OrderNo,
- PayAmount = x.PayAmount,
- RechargeAmount = x.RechargeAmount,
- PayStatus = x.PayStatus,
+ PayAmount = x.PayAmount ?? 0,
+ RechargeAmount = x.RechargeAmount ?? 0,
+ PayStatus = x.PayStatus ?? 0,
PayTime = x.PayTime,
OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
RefundCredentialsImgUrl = x.RefundCredentialsImgUrl.GetOssPath(),
@@ -544,16 +552,16 @@
.Select(x =>
new UserLifePayOrderOutput
{
- DiscountAmount = x.DiscountAmount,
+ DiscountAmount = x.DiscountAmount ?? 0,
FinishTime = x.FinishTime,
Id = x.Id,
- LifePayOrderStatus = x.LifePayOrderStatus,
+ LifePayOrderStatus = x.LifePayOrderStatus?? 0 ,
LifePayOrderType = x.LifePayOrderType,
LifePayType = x.LifePayType,
OrderNo = x.OrderNo,
- PayAmount = x.PayAmount,
- RechargeAmount = x.RechargeAmount,
- PayStatus = x.PayStatus,
+ PayAmount = x.PayAmount ?? 0,
+ RechargeAmount = x.RechargeAmount ?? 0,
+ PayStatus = x.PayStatus ?? 0,
PayTime = x.PayTime,
OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
RefundCredentialsImgUrl = x.RefundCredentialsImgUrl.GetOssPath(),
@@ -579,7 +587,7 @@
public async Task<LifePayStatusEnum> GetPayStatusByOrderNo(string orderNo)
{
return await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo)
- .Select(x => x.PayStatus)
+ .Select(x => x.PayStatus ?? 0)
.FirstOrDefaultAsync();
}
@@ -635,7 +643,7 @@
OrderNo = x.OrderNo,
RefundCheckRemark = x.RefundCheckRemark,
RefundApplyRemark = x.RefundApplyRemark,
- LifePayOrderStatus = x.LifePayOrderStatus,
+ LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
}).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
@@ -724,12 +732,12 @@
{
DiscountAmount = x.DiscountAmount,
FinishTime = x.FinishTime,
- //LifePayOrderStatus = x.LifePayOrderStatus,
+ LifePayOrderStatus = x.LifePayOrderStatus,
LifePayOrderType = x.LifePayOrderType,
LifePayType = x.LifePayType,
OrderNo = x.OrderNo,
PayAmount = x.PayAmount,
- ActualRechargeAmount = x.ActualRechargeAmount.HasValue?x.ActualRechargeAmount.Value:0,
+ ActualRechargeAmount = x.RechargeAmount,
PhoneNumber = x.PhoneNumber,
RechargeAmount = x.RechargeAmount,
OutOrderNo = x.OutOrderNo,
@@ -755,9 +763,9 @@
s.LifePayTypeStr = s.LifePayType.GetDescription();
s.PayStatusStr = s.PayStatus.GetDescription();
s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
- s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();
+ s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
- //s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
+ s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
});
return result;
@@ -830,15 +838,20 @@
var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
- var rate = await GetRate();
- CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.璇濊垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.IspCode)
+ && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
- //var rate = await GetLifePayRate();
+ //var rate = await GetRate();
+ //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
- var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸).Rate);
+ var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸);
+
+ var amount = CalculateAmount(input.ProductData.ParValue, rate);
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
-
+
var orderInput = new CreateLifePayOrderInput
{
@@ -855,8 +868,8 @@
RechargeAmount = amount.RechargeAmount,
ChannelId = channle.ChannlesNum,
PlatformRate = platformRate.Rate,
- PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,
- ChannleRate = channle.ChannlesRate,
+ PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
+ ChannleRate = rate,
ChannlesRakeRate = channle.ChannlesRakeRate,
//ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
};
@@ -884,10 +897,16 @@
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.绂佺敤, "娓犻亾宸茶绂佺敤");
- var rate = await GetRate();
- CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+ //var rate = await GetRate();
+ //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐢佃垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)
+ && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
- var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸).Rate);
+ var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸);
+
+ var amount = CalculateAmount(input.ProductData.ParValue, rate);
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
@@ -906,7 +925,7 @@
RechargeAmount = amount.RechargeAmount,
ChannelId = channle.ChannlesNum,
PlatformRate = platformRate.Rate,
- ChannleRate = channle.ChannlesRate,
+ ChannleRate = rate,
ChannlesRakeRate = channle.ChannlesRakeRate,
};
@@ -933,10 +952,17 @@
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.绂佺敤, "娓犻亾宸茶绂佺敤");
- var rate = await GetRate();
- CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+ //var rate = await GetRate();
+ //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐕冩皵璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)
+ && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).ToListAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
- var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸).Rate);
+
+ var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸);
+
+ var amount = CalculateAmount(input.ProductData.ParValue, rate);
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
@@ -953,7 +979,10 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.ChannlesNum
+ ChannelId = channle.ChannlesNum,
+ PlatformRate = platformRate.Rate,
+ ChannleRate = rate,
+ ChannlesRakeRate = channle.ChannlesRakeRate,
};
await CreateLifePayOrder(orderInput);
@@ -1000,17 +1029,17 @@
#if DEBUG
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
- var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount ?? 0, ip, input.H5Type);
#else
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
- var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount??0, ip, input.H5Type);
#endif
return payUrl;
}
/// <summary>
- /// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
+ /// 鑾峰彇寰俊鏀粯鐨凧SAPI
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -1022,6 +1051,8 @@
CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
order.LifePayType = input.LifePayType;
+ var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+ order.PremiumRate = premium == null ? 0 : premium.Rate;
await _lifePayOrderRepository.UpdateAsync(order);
var desc = "鐢熸椿缂磋垂-";
@@ -1046,11 +1077,30 @@
// var result = await PayTransactionsJsAPI(input.OpenId, input.Attach, order.PayAmount, input.OrderNo, desc);
- var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, order.PayAmount, input.OrderNo, desc);
+ var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, order.PayAmount ?? 0, input.OrderNo, desc);
return result;
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
+ }
+
+ /// <summary>
+ /// 淇敼瀹為檯鍒拌处閲戦
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input)
+ {
+ var order = await _lifePayOrderRepository.Where(x => x.Id == input.Id).FirstOrDefaultAsync();
+
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+ CheckExtensions.IfTrueThrowUserFriendlyException(order.ACOOLYStatus != ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�, "璇ヨ鍗曟棤娉曚慨鏀瑰埌璐﹂噾棰�");
+
+ order.ActualReceivedAmount = input.ActualReceivedAmount;
+
+ await _lifePayOrderRepository.UpdateAsync(order);
+
+ return Constant.SUCCESS;
}
/// <summary>
@@ -1089,7 +1139,7 @@
#endif
CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
- "璋冪敤ACOOLY鎺ュ彛ConfirmElectricOrder杩斿洖閿欒:" + JsonConvert.SerializeObject(result));
+ result.Message);
return (result.Code, requestInput.RequestNo, result.PhoneChargeOrder.BusiOrderNo);
}
@@ -1120,7 +1170,7 @@
#endif
CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
- "璋冪敤ACOOLY鎺ュ彛ConfirmElectricOrder杩斿洖閿欒:" + JsonConvert.SerializeObject(result));
+ result.Message);
return (result.Code, requestInput.RequestNo, result.ElectricChargeOrder.BusiOrderNo);
}
@@ -1148,7 +1198,7 @@
#endif
CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
- "璋冪敤ACOOLY鎺ュ彛ConfirmElectricOrder杩斿洖閿欒:" + JsonConvert.SerializeObject(result));
+ result.Message);
return (result.Code, requestInput.RequestNo, result.GasChargeOrder.BusiOrderNo);
}
@@ -1266,6 +1316,7 @@
_logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ order.RefundApplyRemark = ex.Message;
}
_logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
await _lifePayOrderRepository.UpdateAsync(order);
@@ -1285,7 +1336,7 @@
case LifePayRefundStatusEnum.閫�娆句腑:
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
break;
- default:break;
+ default: break;
}
}
@@ -1295,7 +1346,7 @@
/// <param name="orderNo"></param>
/// <param name="outOrderNo"></param>
/// <returns></returns>
- public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount,string refundApplyRemark)
+ public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark)
{
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
@@ -1350,7 +1401,7 @@
if (input.LifePayRefundType == LifePayRefundTypeEnum.鍏ㄩ閫�娆�)
{
- input.RefundPrice = order.PayAmount;
+ input.RefundPrice = order.PayAmount ?? 0;
}
if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� || order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayRefundStatus != LifePayRefundStatusEnum.寰呴��娆�)
@@ -1363,7 +1414,7 @@
switch (order.LifePayType)
{
case LifePayTypeEnum.WxPay:
- var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo,order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
+ var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo, order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
if (wxRefundResult.Status == "SUCCESS")
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
@@ -1387,7 +1438,7 @@
break;
case LifePayTypeEnum.AliPay:
- var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice).ToString() });
+ var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = input.RefundPrice.ToString() });
if (aliRefundResult.Code != AlipayResultCode.Success)
{
throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
@@ -1465,7 +1516,7 @@
/// <param name="total"></param>
/// <param name="currency"></param>
/// <returns></returns>
- public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo,string outRefundNo, string reason, int refund, int total, string currency = "CNY")
+ public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string outRefundNo, string reason, int refund, int total, string currency = "CNY")
{
WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
{
@@ -1619,7 +1670,7 @@
dto.Status = input.Status;
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
+ await LifePayOrderHistory("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
#endregion
}
@@ -1632,7 +1683,7 @@
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
+ await LifePayOrderHistory("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
#endregion
}
@@ -1649,8 +1700,7 @@
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
-
+ await LifePayOrderHistory("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
#endregion
}
@@ -1763,15 +1813,21 @@
private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
{
- /// 姝ｅ父鏀粯
- //var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
+ if (_initSettingOptions.OpenTheOnePennyTest)
+ {
+ /// 1鍒嗛挶鏀粯
+ decimal payAmount = 0.01m;
- /// 1鍒嗛挶鏀粯
- decimal payAmount = 0.01m;
+ CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "鏀粯閲戦閿欒");
- CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "鏀粯閲戦閿欒");
-
- return (payAmount, amount - payAmount, amount);
+ return (payAmount, amount - payAmount, amount);
+ }
+ else
+ {
+ /// 姝ｅ父鏀粯
+ var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
+ return (payAmount, amount - payAmount, amount);
+ }
}
private void SetOrderStatus(LifePayOrder order, string code)
@@ -1974,6 +2030,7 @@
{
var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+ .Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -1985,39 +2042,39 @@
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || channles.Contains(x.ChannelId))
- join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
- from b in temp.DefaultIfEmpty()
- select new LifePayOrderListOutput
- {
- DiscountAmount = a.DiscountAmount,
- FinishTime = a.FinishTime,
- Id = a.Id,
- LifePayOrderStatus = a.LifePayOrderStatus,
- LifePayOrderType = a.LifePayOrderType,
- LifePayType = a.LifePayType,
- OrderNo = a.OrderNo,
- PayAmount = a.PayAmount,
- PhoneNumber = a.PhoneNumber,
- RechargeAmount = a.RechargeAmount,
- UserId = a.UserId,
- OutOrderNo = a.OutOrderNo,
- PayStatus = a.PayStatus,
- PayTime = a.PayTime,
- ACOOLYOrderNo = a.ACOOLYOrderNo,
- RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
- RefundPrice = a.RefundPrice,
- CreationTime = a.CreationTime,
- RefundCheckRemark = a.RefundCheckRemark,
- RefundApplyRemark = a.RefundApplyRemark,
- RefundTime = a.RefundTime,
- ChannelName = b.ChannlesName,
- ActualRechargeAmount = a.ActualRechargeAmount,
- PlatformDeductionAmount = a.PlatformDeductionAmount,
- ACOOLYStatus = a.ACOOLYStatus,
- LifePayRefundStatus = a.LifePayRefundStatus,
- });
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
+ from b in temp.DefaultIfEmpty()
+ select new LifePayOrderListOutput
+ {
+ DiscountAmount = a.DiscountAmount ?? 0,
+ FinishTime = a.FinishTime,
+ Id = a.Id,
+ LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
+ LifePayOrderType = a.LifePayOrderType,
+ LifePayType = a.LifePayType,
+ OrderNo = a.OrderNo,
+ PayAmount = a.PayAmount ?? 0,
+ PhoneNumber = a.PhoneNumber,
+ RechargeAmount = a.RechargeAmount ?? 0,
+ UserId = a.UserId,
+ OutOrderNo = a.OutOrderNo,
+ PayStatus = a.PayStatus ?? 0,
+ PayTime = a.PayTime,
+ ACOOLYOrderNo = a.ACOOLYOrderNo,
+ RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+ RefundPrice = a.RefundPrice,
+ CreationTime = a.CreationTime,
+ RefundCheckRemark = a.RefundCheckRemark,
+ RefundApplyRemark = a.RefundApplyRemark,
+ RefundTime = a.RefundTime,
+ ChannelName = b.ChannlesName,
+ ActualRechargeAmount = a.ActualRechargeAmount,
+ PlatformDeductionAmount = a.PlatformDeductionAmount,
+ ACOOLYStatus = a.ACOOLYStatus,
+ LifePayRefundStatus = a.LifePayRefundStatus,
+ });
-
+
return result;
}
@@ -2036,39 +2093,40 @@
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
- join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
- from b in temp.DefaultIfEmpty()
- select new LifePayOrderListOutput
- {
- DiscountAmount = a.DiscountAmount,
- FinishTime = a.FinishTime,
- Id = a.Id,
- LifePayOrderStatus = a.LifePayOrderStatus,
- LifePayOrderType = a.LifePayOrderType,
- LifePayType = a.LifePayType,
- OrderNo = a.OrderNo,
- PayAmount = a.PayAmount,
- PhoneNumber = a.PhoneNumber,
- RechargeAmount = a.RechargeAmount,
- UserId = a.UserId,
- OutOrderNo = a.OutOrderNo,
- PayStatus = a.PayStatus,
- PayTime = a.PayTime,
- ACOOLYOrderNo = a.ACOOLYOrderNo,
- RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
- CreationTime = a.CreationTime,
- RefundCheckRemark = a.RefundCheckRemark,
- RefundApplyRemark = a.RefundApplyRemark,
- RefundApplyTime = a.RefundApplyTime,
- RefundTime = a.RefundTime,
- RefundPrice = a.RefundPrice,
- ChannelName = b.ChannlesName,
- ActualRechargeAmount = a.ActualRechargeAmount,
- PlatformDeductionAmount = a.PlatformDeductionAmount,
- ACOOLYStatus = a.ACOOLYStatus,
- LifePayRefundStatus = a.LifePayRefundStatus,
- ActualReceivedAmount = a.ActualReceivedAmount.HasValue? a.ActualReceivedAmount.Value : 0
- });
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
+ from b in temp.DefaultIfEmpty()
+ select new LifePayOrderListOutput
+ {
+ DiscountAmount = a.DiscountAmount ?? 0,
+ FinishTime = a.FinishTime,
+ Id = a.Id,
+ LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
+ LifePayOrderType = a.LifePayOrderType,
+ LifePayType = a.LifePayType,
+ OrderNo = a.OrderNo,
+ PayAmount = a.PayAmount ?? 0,
+ PhoneNumber = a.PhoneNumber,
+ RechargeAmount = a.RechargeAmount ?? 0,
+ UserId = a.UserId,
+ OutOrderNo = a.OutOrderNo,
+ PayStatus = a.PayStatus ?? 0,
+ PayTime = a.PayTime,
+ ACOOLYOrderNo = a.ACOOLYOrderNo,
+ RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+ CreationTime = a.CreationTime,
+ RefundCheckRemark = a.RefundCheckRemark,
+ RefundApplyRemark = a.RefundApplyRemark,
+ RefundApplyTime = a.RefundApplyTime,
+ RefundTime = a.RefundTime,
+ RefundOrderNo = a.RefundOrderNo,
+ RefundPrice = a.RefundPrice,
+ ChannelName = b.ChannlesName,
+ ActualRechargeAmount = a.ActualRechargeAmount,
+ PlatformDeductionAmount = a.PlatformDeductionAmount,
+ ACOOLYStatus = a.ACOOLYStatus,
+ LifePayRefundStatus = a.LifePayRefundStatus,
+ ActualReceivedAmount = a.ActualReceivedAmount.HasValue ? a.ActualReceivedAmount.Value : 0
+ });
return result;
}
private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
@@ -2087,8 +2145,8 @@
});
}
- public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal? platformRate,decimal? channleRate,
- decimal? channlesRakeRate,decimal? premiumRate)
+ public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate,
+ decimal channlesRakeRate, decimal premiumRate)
{
/// 姣涘埄
var grossProfit = price * (channleRate - platformRate) / 100;
@@ -2097,26 +2155,26 @@
var platformPrice = price * platformRate / 100;
/// 鎵嬬画璐�
- var premiumPrice = priceAmount * premiumRate / 100;
+ var premiumPrice = priceAmount * (premiumRate) / 100;
/// 娓犻亾浣ｉ噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
- var channlesRakePrice = grossProfit * channlesRakeRate / 100;
+ var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;
/// 鍒╂鼎
- var profit = grossProfit - channlesRakePrice - premiumPrice;
+ var profit = grossProfit - channlesRakePrice - (premiumRate);
return new OrderPriceReturn()
{
- PlatformPrice = platformPrice.HasValue? platformPrice.Value :0,
- PremiumPrice = premiumPrice.HasValue ? premiumPrice.Value : 0,
- ChannlesRakePrice = channlesRakePrice.HasValue? channlesRakePrice.Value:0,
- Profit = profit.HasValue ? profit.Value : 0
+ PlatformPrice = platformPrice,
+ PremiumPrice = premiumPrice,
+ ChannlesRakePrice = channlesRakePrice,
+ Profit = profit
};
}
- public async Task<decimal> GetLifePayRate(string channelId, LifePayRateTypeEnum lifePayRateType)
+ public async Task<decimal> GetLifePayRate(CreateEditPayChannelsInput channel, LifePayRateTypeEnum lifePayRateType)
{
- if (string.IsNullOrEmpty(channelId))
+ if (channel == null)
{
var rate = await GetRate();
CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
@@ -2125,9 +2183,6 @@
}
else
{
- var channel = await _lifePayChannlesRep.Where(x => x.ChannlesNum == channelId).FirstOrDefaultAsync();
-
- CheckExtensions.IfTrueThrowUserFriendlyException(channel == null, "鏈壘鍒板搴旀笭閬�");
return channel.ChannlesRate;
}
}
--
Gitblit v1.9.1