LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs

@@ -10,11 +10,11 @@

public interface ILifePayOrderService : IApplicationService
{
    Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input);
    Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input);

    Task AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input);

    Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input);
    Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input);

    Task AddLifePayExpensesReceipts(AddLifePayExpensesReceiptsInput input);


 LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs

@@ -300,6 +300,8 @@
    /// <returns></returns>
    Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo);

    

    /// <summary>
    /// 设置生活缴费支付类型
    /// </summary>
@@ -326,5 +328,9 @@
    /// <exception cref="UserFriendlyException"></exception>
    Task<string> GetPayQRCode(LifePayTypeEnum payType, string outTradeNo, string description, decimal amount, string ip, string h5Type);


    Task<bool> CheckChannelsStatus(string channlesId);



}

 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs

@@ -1110,10 +1110,8 @@
    /// </summary>
    public string Link { get; set; }
}
public class LifePayRechargeReceiptsPageOutput<T> : PageOutputBase
public class LifePayRechargeReceiptsStatistics
{

    public List<T> Data { get; set; } = new List<T>();

    /// <summary>
    /// 累计充值
@@ -1216,11 +1214,8 @@
    /// </summary>
    public DateTime FinishTime { get; set; }
}
public class LifePayExpensesReceiptsPageOutput<T> : PageOutputBase
public class LifePayExpensesReceiptsStatistics
{

    public List<T> Data { get; set; } = new List<T>();

    /// <summary>
    /// 累计收入
    /// </summary>

 LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs

@@ -44,7 +44,7 @@
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
        public async Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
        {
            var list = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false)
                .WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord))
@@ -62,10 +62,10 @@
                .GetPageResult(input.PageModel);

            var total = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.RechargeAmount);
            LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput> result = new LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>();
            result.Data = list.Data;
            result.TotalRechargeAmount = total;
            return result;
            LifePayRechargeReceiptsStatistics objectData = new LifePayRechargeReceiptsStatistics();
            objectData.TotalRechargeAmount = total;
            list.ObjectData = objectData;
            return list;
        }


@@ -109,7 +109,7 @@
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
        public async Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
        {
            var list = await _lifePayExpensesReceiptsRepository.Where(x => x.IsDeleted == false)
                .WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) || x.OutOrderNo.Contains(input.KeyWord))
@@ -133,12 +133,12 @@
            var totalIncome = await _lifePayExpensesReceiptsRepository.Where(x => x.IsDeleted == false && x.ExpensesReceiptsType == ExpensesReceiptsTypeEnum.Expenses).SumAsync(x => x.Amount);
            var totalRefund = await _lifePayExpensesReceiptsRepository.Where(x => x.IsDeleted == false && x.ExpensesReceiptsType == ExpensesReceiptsTypeEnum.Receipts).SumAsync(x => x.Amount);

            LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput> result = new LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>();
            result.Data = list.Data;
            result.TotalIncome = totalIncome;
            result.TotalRefund = totalRefund;
            result.RealIncome = totalIncome - totalRefund;
            return result;
            LifePayExpensesReceiptsStatistics objectData = new LifePayExpensesReceiptsStatistics();
            objectData.TotalIncome = totalIncome;
            objectData.TotalRefund = totalRefund;
            objectData.RealIncome = totalIncome - totalRefund;
            list.ObjectData = objectData;
            return list;
        }

        /// <summary>

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -872,6 +872,8 @@
        return await _wxPayApi.WxPayTradeQuery(outTradeNo);
    }

  

    #endregion

    #region 操作

 LifePayment/LifePayment.Application/LifePay/StatisticsService.cs

@@ -125,8 +125,9 @@
            }
        }

        //public async Task<ReceiptsListOutPut> GetReceiptsList()
        //public async Task<ReceiptsListOutPut> GetReceiptsList(string channleId = "")
        //{
        //    var today = DateTime.Now.Date;

        //}
    }

 LifePayment/LifePayment.Application/User/AccountService.cs

@@ -92,6 +92,11 @@

            return result;
        }
        //public async Task<UserChannelOutput> GetUserChannel()
        //{
        //    var userchannel = await _userChannleRep.Where
        //}


        #endregion

@@ -322,10 +327,15 @@

            return res.Id;
        }


        

        #endregion

        #endregion


    }

}

 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml

@@ -302,6 +302,12 @@
            <param name="outTradeNo"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetAllLifePayExpensesReceipts">
            <summary>
            同步订单收支信息
            </summary>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.CreateLifePayPhoneOrder(LifePayment.Application.Contracts.CreateLifePayOrderInput{LifePayment.Application.Contracts.LifePhoneData})">
            <summary>
            创建生活缴费话费订单

 LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml

@@ -1681,7 +1681,7 @@
            在线客服链接
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayRechargeReceiptsPageOutput`1.TotalRechargeAmount">
        <member name="P:LifePayment.Application.Contracts.LifePayRechargeReceiptsStatistics.TotalRechargeAmount">
            <summary>
            累计充值
            </summary>
@@ -1766,21 +1766,26 @@
            交易时间
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsPageOutput`1.TotalIncome">
        <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsStatistics.TotalIncome">
            <summary>
            累计收入
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsPageOutput`1.TotalRefund">
        <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsStatistics.TotalRefund">
            <summary>
            累计退款
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsPageOutput`1.RealIncome">
        <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsStatistics.RealIncome">
            <summary>
            实际收入
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.ReceiptsListOutPut.CreationTime">
            <summary>
            创建时间
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.RecordOperateHistoryEto.RelationId">
            <summary>
            关联关系ID

 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs

@@ -437,7 +437,7 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
        public async Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
        {
            return await _lifePayOrderService.GetLifePayRechargeReceiptsPage(input);
        }
@@ -448,7 +448,7 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
        public async Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
        {
            return await _lifePayOrderService.GetLifePayExpensesReceiptsPage(input);
        }
@@ -528,6 +528,10 @@
            return res;
        }

        /// <summary>
        /// 同步订单收支信息
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [AllowAnonymous]
        public async Task GetAllLifePayExpensesReceipts()
@@ -535,6 +539,8 @@
            await _lifePayOrderService.GetAllLifePayExpensesReceipts();
        }

        

        #endregion

        #region 操作

 LifePayment/LifePayment.HttpApi/LifePay/UserRoleController.cs

@@ -199,5 +199,11 @@
            await _identityRoleService.DeleteAsync(id);
            return await _userRoleService.DeleteRole(id);
        }

        //[HttpGet]
        //public async Task<UserChannelOutput> GetUserChannel()
        //{
        //    return await _accountService.GetUserChannel();
        //}
    }
}