From d699bedade1d20e5f36bb09ba73e0a8b7c62e014 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 14:30:45 +0800
Subject: [PATCH] fix:新增返回值
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 2755ca3..ff3ef8a 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -120,12 +120,13 @@
YesterdayFail = yesterdayFail.ToString(),
AccumulatedUsers = accumulatedUsers.ToString(),
};
-
- return new TopStatisticsOutput();
+ await _dallyStatisticsRepository.InsertAsync(entity);
+ var result = ObjectMapper.Map<DallyStatistics, TopStatisticsOutput>(entity);
+ return result;
}
else
{
- var result = ObjectMapper.Map<DallyStatistics,TopStatisticsOutput>(statistics);
+ var result = ObjectMapper.Map<DallyStatistics, TopStatisticsOutput>(statistics);
return result;
}
}
@@ -303,6 +304,7 @@
PayTime = a.PayTime,
ACOOLYOrderNo = a.ACOOLYOrderNo,
RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+ RefundPrice = a.RefundPrice,
CreationTime = a.CreationTime,
RefundCheckRemark = a.RefundCheckRemark,
RefundApplyRemark = a.RefundApplyRemark,
@@ -317,6 +319,11 @@
return result;
}
+ /// <summary>
+ /// 閫�娆捐鍗曞垎椤�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
{
@@ -357,7 +364,9 @@
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,
@@ -407,6 +416,8 @@
RefundPrice = order.RefundPrice,
PlatformRate = platformRate.Rate,
PlatformPrice = order.PlatformDeductionAmount,
+ ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+ RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
ChannleRate = channle.ChannlesRate,
ChannlesRakeRate = channle.ChannlesRakeRate,
ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
@@ -456,6 +467,8 @@
LifePayRefundStatus = order.LifePayRefundStatus,
ActualRechargeAmount = order.ActualRechargeAmount,
RefundPrice = order.RefundPrice,
+ ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+ RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
};
return result;
@@ -736,7 +749,7 @@
var elecInfoInput = new DataBillErceiptApplyInput
{
Type = "FUND_DETAIL",
- Key = orderNo
+ Key = order.OutOrderNo
};
var elecInfoOutput = await _alipayInterfaceManager.DataBillErceiptApply(elecInfoInput);
@@ -934,6 +947,9 @@
break;
case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
desc += "鐢佃垂";
+ break;
+ case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
+ desc += "鐕冩皵";
break;
default:
break;
@@ -1228,8 +1244,6 @@
return;
}
- order.LifePayOrderStatus = status;
- order.ACOOLYStatus = acoolyStatus;
order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
@@ -1246,6 +1260,8 @@
order.PayStatus = LifePayStatusEnum.寰呴��娆�;
}
+ order.LifePayOrderStatus = status;
+ order.ACOOLYStatus = acoolyStatus;
await _lifePayOrderRepository.UpdateAsync(order);
}
--
Gitblit v1.9.1