From caa3547fd5c7ac15c1b6c6df2cc38db4bd23cf09 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 三月 2025 14:53:31 +0800
Subject: [PATCH] fix: s
---
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 161 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index fde6a23..3758621 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -2,6 +2,7 @@
using LifePayment.Domain.Shared;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -19,17 +20,34 @@
public class LifePayController : AbpController
{
private readonly ILifePayService _lifePayService;
+ private readonly IStatisticsService _statisticsService;
private readonly IWebClientInfoProvider _webClientInfoProvider;
+ private readonly ILogger<LifePayController> _logger;
public LifePayController(
ILifePayService lifePayService,
+ IStatisticsService statisticsService,
IWebClientInfoProvider webClientInfoProvider
+ , ILogger<LifePayController> logger
)
{
_lifePayService = lifePayService;
+ _statisticsService = statisticsService;
_webClientInfoProvider = webClientInfoProvider;
+ _logger = logger;
}
#region 鏌ヨ
+
+ /// <summary>
+ /// 鑾峰彇椤堕儴缁熻鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<TopStatisticsOutput> GetTopStatistics()
+ {
+ return await _statisticsService.GetTopStatistics();
+ }
/// <summary>
/// 鑾峰彇鐢佃垂闈㈠��
@@ -54,7 +72,8 @@
{
var aresResult = await _lifePayService.GetElectricSupportArea();
var parValues = await _lifePayService.GetElectricParValue();
-
+ CheckExtensions.IfTrueThrowUserFriendlyException(aresResult == null, "鐢佃垂鍏呭�煎尯鍩熶笉瀛樺湪");
+ CheckExtensions.IfTrueThrowUserFriendlyException(parValues == null, "鐢佃垂闈㈤涓嶅瓨鍦�");
foreach (var item in aresResult.ElectricAreaList)
{
var paritem = parValues.ElectricParValue.Where(r => r.AreaName == item.CityName).FirstOrDefault();
@@ -106,6 +125,20 @@
}
/// <summary>
+ /// 娣诲姞鏃ュ織
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+
+ public async Task<int> AddLogger(LogErrorInput input)
+ {
+ Logger.LogError("鍓嶇閿欒锛�" + input.Error);
+ return Constant.SUCCESS;
+ }
+
+
+ /// <summary>
/// 鑾峰彇鎶樻墸
/// </summary>
/// <returns></returns>
@@ -117,12 +150,46 @@
}
/// <summary>
+ /// 鑾峰彇娓犻亾鎶樻墸
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
+ {
+ return await _lifePayService.GetChannelRate(input);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵嬬画璐硅垂鐜�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<List<LifePayPremiumListOutput>> GetPremium()
+ {
+ return await _lifePayService.GetPremium();
+ }
+
+ /// <summary>
+ /// 鑾峰彇椤荤煡
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum type)
+ {
+ return await _lifePayService.GetIntroInfo(type);
+ }
+
+
+ /// <summary>
/// 鑾峰彇鐢ㄦ埛鍒嗛〉鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
- public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input)
+ public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)
{
return await _lifePayService.GetUserPage(input);
}
@@ -136,6 +203,39 @@
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>
+ /// 鑾峰彇璁㈠崟璇︽儏
+ /// </summary>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<LifePayOrderOutput> GetLifePayOrderDetail(string orderNo)
+ {
+ return await _lifePayService.GetLifePayOrderDetail(orderNo);
+ }
+
+ /// <summary>
+ /// 鑾峰彇閫�娆捐鍗曡鎯�
+ /// </summary>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<LifePayRefundOrderOutput> GetLifePayRefundOrderDetail(string orderNo)
+ {
+ return await _lifePayService.GetLifePayRefundOrderDetail(orderNo);
}
/// <summary>
@@ -186,6 +286,15 @@
public async Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input)
{
return await _lifePayService.GetLifePayChannlesPage(input);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴缂磋垂娓犻亾
+ /// </summary>
+ [HttpGet]
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ {
+ return await _lifePayService.GetLifePayChannlesAllList();
}
/// <summary>
@@ -275,8 +384,33 @@
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;
}
#endregion
@@ -427,6 +561,30 @@
}
/// <summary>
+ /// 鎵嬬画璐硅垂鐜囬厤缃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<int> CreateEditLifePayPremium(List<LifePayPremiumInput> input)
+ {
+ await _lifePayService.CreateEditLifePayPremium(input);
+ return Constant.SUCCESS;
+ }
+
+ /// <summary>
+ /// 椤荤煡閰嶇疆
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<int> EditIntroInfo(LifePayIntroInfoInput input)
+ {
+ await _lifePayService.EditIntroInfo(input);
+ return Constant.SUCCESS;
+ }
+
+ /// <summary>
/// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
/// </summary>
/// <param name="input"></param>
--
Gitblit v1.9.1