From 02f5cf149ac0fecd8c7ee67bf57fb814d8464ba4 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 02 四月 2025 16:31:09 +0800
Subject: [PATCH] fix：统计bug修复

---
 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs |   98 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index dca8f91..f060b43 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -1,6 +1,7 @@
 锘縰sing Alipay.AopSdk.F2FPay.Model;
 using LifePayment.Application.Contracts;
 using LifePayment.Application.LifePay;
+using LifePayment.Domain;
 using LifePayment.Domain.Common;
 using LifePayment.Domain.Shared;
 using Microsoft.AspNetCore.Authorization;
@@ -57,6 +58,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>
@@ -312,9 +362,9 @@
         /// 鑾峰彇鍏ㄩ儴缂磋垂娓犻亾
         /// </summary>
         [HttpGet]
-        public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+        public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)
         {
-            return await _lifePayService.GetLifePayChannlesAllList();
+            return await _lifePayService.GetLifePayChannlesAllList(input);
         }
 
         /// <summary>
@@ -433,6 +483,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>
         /// <param name="input"></param>
@@ -524,16 +585,20 @@
         public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
         {
             var res = await _lifePayService.WxPayDomesticRefundsQuery(outTradeNo);
-            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+            if (res.Code == WxpayResultCode.Success)
             {
-                OrderNo = res.OutTradeNo,
-                OutRefundNo = res.RefundId,
-                OutOrderNo = res.TransactionId,
-                LifePayType = LifePayTypeEnum.WxPay,
-                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
-                Amount = Convert.ToDecimal(res.Amount.Total)
-            });
+                await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+                {
+                    OrderNo = res.OutTradeNo,
+                    OutRefundNo = res.RefundId,
+                    OutOrderNo = res.TransactionId,
+                    LifePayType = LifePayTypeEnum.WxPay,
+                    ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+                    Amount = Convert.ToDecimal(res.Amount.Total)
+                });
+            }
             return res;
+
         }
 
         /// <summary>
@@ -569,7 +634,7 @@
         }
 
         /// <summary>
-        /// 鍚屾璁㈠崟
+        /// 鍚屾璁㈠崟鍒嗕剑淇℃伅
         /// </summary>
         /// <returns></returns>
         [HttpGet]
@@ -579,7 +644,16 @@
             await _lifePayOrderService.GetAllChannlesRake();
         }
 
-
+        /// <summary>
+        /// 缁熻浜ゆ槗娴佹按
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task GetAllLifePayConsumption()
+        {
+            await _lifePayOrderService.GetAllLifePayConsumption();
+        }
         #endregion
 
         #region 鎿嶄綔

--
Gitblit v1.9.1