From e0f2b29f3349d43e7f4222e079c54ba9cc4b6ee1 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 16 六月 2025 11:09:23 +0800
Subject: [PATCH] fix:支付回调及供应商回调并发问题修订
---
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 104 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index 5dd5a70..3d5a3e4 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -15,6 +15,7 @@
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.WebClientInfo;
using ZeroD.Util;
+using ZeroD.Util.Fadd;
namespace LifePayment.HttpApi
{
@@ -58,6 +59,55 @@
public async Task<TopStatisticsOutput> GetTopStatistics(TopStatisticsInput input)
{
return await _statisticsService.GetTopStatistics(input.ChannleList);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎸囧畾澶╂暟鐨勭粺璁℃暟鎹�
+ /// </summary>
+ /// <param name="days"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<int> StatisticsByDate(int days)
+ {
+ await _statisticsService.StatisticsByDate(days);
+ return Constant.SUCCESS;
+ }
+
+ /// <summary>
+ /// 鑾峰彇30鏃ユ敹娆剧粺璁�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<ReceiptsListOutPut> GetReceiptsList(TopStatisticsInput input)
+ {
+ return await _statisticsService.GetReceiptsList(input.ChannleList);
+ }
+
+ /// <summary>
+ /// 娓犻亾鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<ChannelDataListOutPut> GetChannelDataList(TopStatisticsInput input)
+ {
+ return await _statisticsService.GetChannelDataList(input.ChannleList);
+ }
+
+ /// <summary>
+ /// 30鏃ヤ剑閲戝垪琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<ChannlesRakeListOutPut> GetChannlesRakeList(TopStatisticsInput input)
+ {
+ return await _statisticsService.GetChannlesRakeList(input.ChannleList);
}
/// <summary>
@@ -109,6 +159,18 @@
public async Task<PhoneParValueResponse> GetPhoneParValue(ChannelsBaseInput input)
{
return await _lifePayService.GetPhoneParValue();
+ }
+
+ /// <summary>
+ /// 璇濊垂璁㈠崟鏌ヨ
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input)
+ {
+ return await _lifePayService.QueryPhoneOrder(input);
}
/// <summary>
@@ -312,10 +374,10 @@
/// <summary>
/// 鑾峰彇鍏ㄩ儴缂磋垂娓犻亾
/// </summary>
- [HttpGet]
- public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ [HttpPost]
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)
{
- return await _lifePayService.GetLifePayChannlesAllList();
+ return await _lifePayService.GetLifePayChannlesAllList(input);
}
/// <summary>
@@ -409,6 +471,23 @@
}
/// <summary>
+ /// 瀵煎嚭娓犻亾璁㈠崟Excel
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<ActionResult> GetLifePayOrderPageExportForChannle(QueryLifePayOrderListInput input)
+ {
+ var data = await _lifePayService.GetLifePayOrderPageExportForChannle(input);
+ if (data.Any())
+ {
+ 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>
@@ -433,6 +512,17 @@
return data;
}
+ /// <summary>
+ /// 鑾峰彇娑堣垂娴佹按鍒嗛〉鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<PageOutput<LifePayConsumptionListOutput>> GetLifePayConsumptionPage(LifePayConsumptionPageInput input)
+ {
+ return await _lifePayOrderService.GetLifePayConsumptionPage(input);
+ }
+
/// <summary>
/// 鑾峰彇鍏呭�兼祦姘村垎椤垫暟鎹�
/// </summary>
@@ -574,7 +664,7 @@
}
/// <summary>
- /// 鍚屾璁㈠崟
+ /// 鍚屾璁㈠崟鍒嗕剑淇℃伅
/// </summary>
/// <returns></returns>
[HttpGet]
@@ -584,7 +674,16 @@
await _lifePayOrderService.GetAllChannlesRake();
}
-
+ /// <summary>
+ /// 缁熻浜ゆ槗娴佹按
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task GetAllLifePayConsumption()
+ {
+ await _lifePayOrderService.GetAllLifePayConsumption();
+ }
#endregion
#region 鎿嶄綔
--
Gitblit v1.9.1