From 18325eda17439bdd76f3b7e3f39cfae312738b2b Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 06:59:13 +0800
Subject: [PATCH] fix:提交
---
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 217 insertions(+), 10 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index e3c7a06..bdd5ba4 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -1,4 +1,7 @@
-锘縰sing LifePayment.Application.Contracts;
+锘縰sing Alipay.AopSdk.F2FPay.Model;
+using LifePayment.Application.Contracts;
+using LifePayment.Application.LifePay;
+using LifePayment.Domain.Common;
using LifePayment.Domain.Shared;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -20,16 +23,25 @@
public class LifePayController : AbpController
{
private readonly ILifePayService _lifePayService;
+ private readonly IStatisticsService _statisticsService;
private readonly IWebClientInfoProvider _webClientInfoProvider;
+ private readonly ICommonService _commonService;
+ private readonly ILifePayOrderService _lifePayOrderService;
private readonly ILogger<LifePayController> _logger;
public LifePayController(
ILifePayService lifePayService,
- IWebClientInfoProvider webClientInfoProvider
- , ILogger<LifePayController> logger
+ IStatisticsService statisticsService,
+ IWebClientInfoProvider webClientInfoProvider,
+ ICommonService commonService,
+ ILifePayOrderService lifePayOrderService,
+ ILogger<LifePayController> logger
)
{
_lifePayService = lifePayService;
+ _statisticsService = statisticsService;
_webClientInfoProvider = webClientInfoProvider;
+ _commonService = commonService;
+ _lifePayOrderService = lifePayOrderService;
_logger = logger;
}
@@ -39,12 +51,12 @@
/// 鑾峰彇椤堕儴缁熻鏁版嵁
/// </summary>
/// <returns></returns>
- //[HttpGet]
- //[AllowAnonymous]
- //public async Task<TopStatisticsOutput> GetTopStatistics()
- //{
- // return await _lifePayService.GetTopStatistics();
- //}
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<TopStatisticsOutput> GetTopStatistics(string channleId = "")
+ {
+ return await _statisticsService.GetTopStatistics(channleId);
+ }
/// <summary>
/// 鑾峰彇鐢佃垂闈㈠��
@@ -147,6 +159,17 @@
}
/// <summary>
+ /// 鑾峰彇娓犻亾鎶樻墸
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
+ {
+ return await _lifePayService.GetChannelRate(input);
+ }
+
+ /// <summary>
/// 鑾峰彇鎵嬬画璐硅垂鐜�
/// </summary>
/// <returns></returns>
@@ -168,6 +191,16 @@
return await _lifePayService.GetIntroInfo(type);
}
+ /// <summary>
+ /// 鑾峰彇鍦ㄧ嚎瀹㈡湇
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<string> GetOnlineService()
+ {
+ return await _commonService.GetOnlineService();
+ }
/// <summary>
/// 鑾峰彇鐢ㄦ埛鍒嗛〉鏁版嵁
@@ -189,6 +222,17 @@
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
{
return await _lifePayService.GetLifePayOrderPage(input);
+ }
+
+ /// <summary>
+ /// 鑾峰彇閫�娆捐鍗曞垎椤垫暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
+ {
+ return await _lifePayService.GetLifePayRefundOrderPage(input);
}
/// <summary>
@@ -359,8 +403,136 @@
var bytes = ExcelHelper.ListToByteForExcel(data, "xlsx");
return File(bytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "璁㈠崟绠＄悊" + ".xlsx");
}
-
return Json(default);
+ }
+
+ /// <summary>
+ /// 瀵煎嚭閫�娆捐鍗旹xcel
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<ActionResult> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)
+ {
+ var data = await _lifePayService.GetLifePayRefudOrderPageExport(input);
+ if (data.Any())
+ {
+ var bytes = ExcelHelper.ListToByteForExcel(data, "xlsx");
+ return File(bytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "閫�娆剧鐞�" + ".xlsx");
+ }
+ return Json(default);
+ }
+
+
+ [HttpGet]
+ public async Task<string> GetBillErceiptExport(string orderNo)
+ {
+ var data = await _lifePayService.GetBillErceiptExport(orderNo);
+
+ return data;
+ }
+ /// <summary>
+ /// 鑾峰彇鍏呭�兼祦姘村垎椤垫暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
+ {
+ return await _lifePayOrderService.GetLifePayRechargeReceiptsPage(input);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏀舵敮娴佹按鍒嗛〉鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
+ {
+ return await _lifePayOrderService.GetLifePayExpensesReceiptsPage(input);
+ }
+
+ /// <summary>
+ /// 鏌ヨ鏀粯瀹濇敮浠樿鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<Alipay.EasySDK.Payment.Common.Models.AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)
+ {
+ var res = await _lifePayService.QueryAlipayTrade(input);
+ //await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ //{
+ // OrderNo = input.OutTradeNo,
+ // OutOrderNo = res.TradeNo,
+ // LifePayType = LifePayTypeEnum.AliPay,
+ // ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ // Amount = Convert.ToDecimal(res.ReceiptAmount)
+ //});
+ return res;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鏀粯瀹濋��娆捐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<Alipay.EasySDK.Payment.Common.Models.AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
+ {
+ return await _lifePayService.QueryAlipayTradeRefund(input);
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊閫�娆句俊鎭�
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
+ {
+ var res = await _lifePayService.WxPayDomesticRefundsQuery(outTradeNo);
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = res.OutTradeNo,
+ OutOrderNo = res.TransactionId,
+ LifePayType = LifePayTypeEnum.WxPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ Amount = Convert.ToDecimal(res.Amount.Total)
+ });
+ return res;
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
+ {
+ var res = await _lifePayService.WxPayTradeQuery(outTradeNo);
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = res.OutTradeNo,
+ OutOrderNo = res.TransactionId,
+ LifePayType = LifePayTypeEnum.WxPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ Amount = Convert.ToDecimal(res.Amount.Total)
+ });
+ return res;
+ }
+
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task GetAllLifePayExpensesReceipts()
+ {
+ await _lifePayOrderService.GetAllLifePayExpensesReceipts();
}
#endregion
@@ -404,6 +576,17 @@
public async Task<CreateLifePayOrderOutput> CreateLifePayGasOrder(CreateLifePayOrderInput<LifeGasData> input)
{
return await _lifePayService.CreateLifePayGasOrder(input);
+ }
+
+ /// <summary>
+ /// 淇敼瀹為檯鍒拌处閲戦
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input)
+ {
+ return await _lifePayService.UpdateLifePayOrderActualReceivedAmount(input);
}
/// <summary>
@@ -535,6 +718,30 @@
}
/// <summary>
+ /// 鍦ㄧ嚎瀹㈡湇閰嶇疆
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<int> UpdateOnlineService(OnlineServiceInput input)
+ {
+ await _commonService.UpdateOnlineService(input);
+ return Constant.SUCCESS;
+ }
+
+ /// <summary>
+ /// 涓婁紶鍏呭�兼祦姘�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<int> AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input)
+ {
+ await _lifePayOrderService.AddUpdatePayRechargeReceipts(input);
+ return Constant.SUCCESS;
+ }
+
+ /// <summary>
/// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
/// </summary>
/// <param name="input"></param>
--
Gitblit v1.9.1