From 481c2276623c9f12ce5452334422b8b1322fed45 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 31 三月 2025 10:14:53 +0800
Subject: [PATCH] fix: bug
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 219 ++++++++++++++++++++++++++++++------------------------
1 files changed, 123 insertions(+), 96 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 715815b..4d09890 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -51,6 +51,7 @@
private readonly IAlipayInterfaceManager _alipayInterfaceManager;
private readonly IWxPayApi _wxPayApi;
private readonly WxPayOption _wxPayOptions;
+ private readonly InitSetting _initSettingOptions;
private readonly IACOOLYManager _aCOOLYManager;
@@ -67,6 +68,7 @@
IAlipayInterfaceManager aliPayInterfaceManager,
IWxPayApi wxPayApi,
IOptions<WxPayOption> wxPayOptions,
+ IOptions<InitSetting> initSettingOptions,
IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayAccount, Guid> lifePayAccount,
IDataFilter dataFilter,
@@ -83,6 +85,7 @@
_alipayInterfaceManager = aliPayInterfaceManager;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
+ _initSettingOptions = initSettingOptions.Value;
_distributedEventBus = distributedEventBus;
_lifePayChannlesRep = lifePayChannlesRep;
_lifePayAccount = lifePayAccount;
@@ -194,6 +197,8 @@
.WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) || x.Name.Contains(input.QueryCondition))
.WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
.WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
+ .WhereIf(input.LoginTimeBegin.HasValue, x => x.LastLoginTime >= input.LoginTimeBegin)
+ .WhereIf(input.LoginTimeEnd.HasValue, x => x.LastLoginTime <= input.LoginTimeEnd)
.Select(x =>
new UserListOutput()
{
@@ -815,6 +820,50 @@
return "";
}
}
+
+ /// <summary>
+ /// 鏌ヨ鏀粯瀹濇敮浠樿鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)
+ {
+ var result = await _aliPayApi.OrderInQuiry(input);
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鏀粯瀹濋��娆捐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
+ {
+ var result = await _aliPayApi.QueryAlipayTradeRefund(input);
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊閫�娆捐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
+ {
+ return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
+ {
+ return await _wxPayApi.WxPayTradeQuery(outTradeNo);
+ }
+
#endregion
#region 鎿嶄綔
@@ -835,10 +884,10 @@
var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.璇濊垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
- && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.IspCode)
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑
&& x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
@@ -854,7 +903,7 @@
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,
//LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -896,22 +945,21 @@
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐢佃垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
&& x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)
&& x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+
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
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -951,7 +999,7 @@
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐕冩皵璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.GasOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
&& x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)
&& x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).ToListAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
@@ -967,7 +1015,7 @@
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.GasOrder,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -998,38 +1046,15 @@
/// <returns></returns>
public async Task<string> SetLifePayOrderPayType(SetLifePayOrderPayTypeInput input, string ip)
{
- var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- 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 = "鐢熸椿缂磋垂-";
- switch (order.LifePayOrderType)
- {
- case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
- desc += "璇濊垂";
- break;
- case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
- desc += "鐢佃垂";
- break;
- case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
- desc += "鐕冩皵";
- break;
- default:
- break;
- }
+ var res = await SetPayType(input.OrderNo, input.LifePayType, ip);
#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 ?? 0, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, 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??0, ip, input.H5Type);
+ //var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, 0.01m, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
#endif
return payUrl;
@@ -1042,43 +1067,9 @@
/// <returns></returns>
public async Task<ModelPaymentMiniPay> GetPayOrderForJsAPI(GetPayOrderForJsAPIInput input, string ip)
{
- var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
-
- 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 = "鐢熸椿缂磋垂-";
- switch (order.LifePayOrderType)
- {
- case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
- desc += "璇濊垂";
- break;
- case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
- desc += "鐢佃垂";
- break;
- case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
- desc += "鐕冩皵";
- break;
- default:
- break;
- }
-
-
- //var result = await PayTransactionsJsAPI(input.OpenId, input.Attach, 0.01m, input.OrderNo, desc);
- //return result;
-
- // 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 ?? 0, input.OrderNo, desc);
+ var res = await SetPayType(input.OrderNo, input.LifePayType, ip);
+ var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, res.PayAmount, input.OrderNo, res.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>
@@ -1107,8 +1098,6 @@
/// <returns></returns>
public async Task CreateLifePayOrder(CreateLifePayOrderInput input)
{
- CheckExtensions.IfTrueThrowUserFriendlyException(input.RechargeAmount < 0.01m || input.PayAmount < 0.01m || input.DiscountAmount < 0, "璁㈠崟閲戦閿欒");
-
var entity = ObjectMapper.Map<CreateLifePayOrderInput, LifePayOrder>(input);
await _lifePayOrderRepository.InsertAsync(entity);
}
@@ -1289,13 +1278,13 @@
var result = (Code: "Fail", RequestNo: "", ACOOLYOrderNo: "");
switch (order.LifePayOrderType)
{
- case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
+ case LifePayOrderTypeEnum.PhoneOrder:
result = await CreateACOOLYPhoneOrder(JsonConvert.DeserializeObject<LifePhoneData>(order.OrderParamDetailJsonStr), order.OrderNo);
break;
- case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
+ case LifePayOrderTypeEnum.ElectricOrder:
result = await CreateACOOLYElectricOrder(JsonConvert.DeserializeObject<LifeElectricData>(order.OrderParamDetailJsonStr), order.OrderNo);
break;
- case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
+ case LifePayOrderTypeEnum.GasOrder:
result = await CreateACOOLYGasOrder(JsonConvert.DeserializeObject<LifeGasData>(order.OrderParamDetailJsonStr), order.OrderNo);
break;
default:
@@ -1306,7 +1295,7 @@
order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
//SetOrderStatus(order, result.Code);
order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
- order.ACOOLYOrderNo = result.ACOOLYOrderNo.IsNullOrEmpty() ? null : result.ACOOLYOrderNo;
+ order.ACOOLYOrderNo = result.ACOOLYOrderNo;
}
catch (Exception ex)
{
@@ -1422,11 +1411,6 @@
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
}
- else if (wxRefundResult.Message == "璁㈠崟宸插叏棰濋��娆�")
- {
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
- }
else
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
@@ -1435,7 +1419,7 @@
break;
case LifePayTypeEnum.AliPay:
- var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = input.RefundPrice.ToString() });
+ var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });
if (aliRefundResult.Code != AlipayResultCode.Success)
{
throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
@@ -1548,7 +1532,7 @@
var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
.FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(userAccount == null, "鎴峰彿涓嶅瓨鍦�");
- var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id)
+ var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id && x.IsDeleted == false)
.FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
@@ -1562,7 +1546,7 @@
}
else
{
- var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content)
+ var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)
.FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
var userAccount = new LifePayAccount
@@ -1580,7 +1564,7 @@
await _lifePayAccount.InsertAsync(userAccount);
}
- if (input.LifePayType == LifePayOrderTypeEnum.璇濊垂璁㈠崟)
+ if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder)
{
var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
@@ -1810,15 +1794,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)
@@ -2178,5 +2168,42 @@
}
}
+ public async Task<SetPayTypeReturn> SetPayType(string orderNo, LifePayTypeEnum lifePayType, string ip)
+ {
+ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+
+ CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
+
+ order.LifePayType = 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 = "鐢熸椿缂磋垂-";
+ switch (order.LifePayOrderType)
+ {
+ case LifePayOrderTypeEnum.PhoneOrder:
+ desc += "璇濊垂";
+ break;
+ case LifePayOrderTypeEnum.ElectricOrder:
+ desc += "鐢佃垂";
+ break;
+ case LifePayOrderTypeEnum.GasOrder:
+ desc += "鐕冩皵";
+ break;
+ default:
+ break;
+ }
+
+ return new SetPayTypeReturn()
+ {
+ Desc = desc,
+ OrderNo = order.OrderNo,
+ PayAmount = order.PayAmount.HasValue? order.PayAmount.Value : 0,
+ LifePayType = lifePayType,
+ };
+ }
+
#endregion
}
--
Gitblit v1.9.1