From 149ce84eb71311ccd9719dc4a883aa9b6e63eeb6 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期四, 20 三月 2025 12:58:49 +0800 Subject: [PATCH] fix:订单列表新增字段 --- LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 100 insertions(+), 2 deletions(-) diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs index fde6a23..7a3c36b 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; @@ -20,16 +21,30 @@ { private readonly ILifePayService _lifePayService; private readonly IWebClientInfoProvider _webClientInfoProvider; + private readonly ILogger<LifePayController> _logger; public LifePayController( ILifePayService lifePayService, IWebClientInfoProvider webClientInfoProvider + , ILogger<LifePayController> logger ) { _lifePayService = lifePayService; _webClientInfoProvider = webClientInfoProvider; + _logger = logger; } #region 鏌ヨ + + /// <summary> + /// 鑾峰彇椤堕儴缁熻鏁版嵁 + /// </summary> + /// <returns></returns> + //[HttpGet] + //[AllowAnonymous] + //public async Task<TopStatisticsOutput> GetTopStatistics() + //{ + // return await _lifePayService.GetTopStatistics(); + //} /// <summary> /// 鑾峰彇鐢佃垂闈㈠�� @@ -54,7 +69,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 +122,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 +147,35 @@ } /// <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); } @@ -137,6 +190,18 @@ { return await _lifePayService.GetLifePayOrderPage(input); } + + /// <summary> + /// 鑾峰彇璁㈠崟璇︽儏 + /// </summary> + /// <param name="orderNo"></param> + /// <returns></returns> + //[HttpGet] + //public async Task<UserLifePayOrderOutput> GetLifePayOrderDetail(string orderNo) + //{ + // return await _lifePayService.GetLifePayOrderDetail(orderNo); + //} + /// <summary> /// 鑾峰彇鎴戠殑璁㈠崟鍒嗛〉鏁版嵁 @@ -186,6 +251,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> @@ -427,6 +501,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