From e35566968a190575b1662fb9f7d1246fda250888 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 19 三月 2025 09:03:17 +0800
Subject: [PATCH] fix: s
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index fc3e010..37a1beb 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -324,19 +324,12 @@
public async Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input)
{
+ return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
+ }
- return await _lifePayChannlesRep.Select(x =>
- new CreateEditPayChannelsInput
- {
- Id = x.Id,
- ChannlesRate = x.ChannlesRate,
- ChannlesName = x.ChannlesName,
- ChannlesNum = x.ChannlesNum,
- Status = x.Status,
- SwitchType = x.SwitchType,
- ChannlesType = x.ChannlesType,
- })
- .GetPageResult(input.PageModel);
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ {
+ return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
}
public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -993,6 +986,9 @@
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曢��娆�");
}
+ /// TODO 閫�娆捐姹傚畬鎴愬悗濡備綍鎿嶄綔
+ /// var refundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
+
order.PayStatus = LifePayStatusEnum.宸查��娆�;
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
@@ -1043,6 +1039,26 @@
await _lifePayOrderRepository.UpdateAsync(order);
}
+ public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string reason, int refund, int total, string currency = "CNY")
+ {
+ WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
+ {
+ OutTradeNo = outTradeNo,
+ OutRefundNo = CreateRefundOrderNo(),
+ Reason = reason,
+ Amount = new Model_WxPayDomesticRefunds_Amount
+ {
+ Refund = refund,
+ Total = total,
+ Currency = "CNY"
+ },
+ NotifyUrl = $"{_wxPayOptions.NotifyUrl}{LifePaymentConstant.WxPayDomesticRefundsNotifySectionUrl}",
+ };
+
+ var res = await _wxPayApi.WxPayDomesticRefunds(req);
+ return res;
+ }
+
public async Task<int> AddUpdateUserAccount(AddUpdateUserAccountInput input)
{
if (input.Id.HasValue)
@@ -1064,7 +1080,6 @@
}
else
{
-
var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content)
.FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
@@ -1238,6 +1253,11 @@
private string CreateOrderNo()
{
return "JF" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + GlobalRandom.GetRandomNum(4);
+ }
+
+ private string CreateRefundOrderNo()
+ {
+ return "JFTK" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + GlobalRandom.GetRandomNum(4);
}
private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
@@ -1476,6 +1496,20 @@
return result;
}
+ private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
+ {
+ return _lifePayChannlesRep.Select(x =>
+ new CreateEditPayChannelsInput
+ {
+ Id = x.Id,
+ ChannlesRate = x.ChannlesRate,
+ ChannlesName = x.ChannlesName,
+ ChannlesNum = x.ChannlesNum,
+ Status = x.Status,
+ SwitchType = x.SwitchType,
+ ChannlesType = x.ChannlesType,
+ });
+ }
- #endregion
-}
+ #endregion
+ }
--
Gitblit v1.9.1