From 40a02313af9a81c17e1a5a9fccfefb2298a3331d Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Thu, 15 Sep 2022 18:49:09 +0800 Subject: [PATCH] 1 --- .../FinancialTerminalBusiness.cs | 40 +++++++++++++++++-- .../Db/FinancialTerminal/AuditPayBill.cs | 4 ++ .../QueryAuditPayBillRequest.cs | 13 ++++++ .../FinancialTerminal/AuditPayBillResponse.cs | 9 +++++ 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 BBWY.Server.Model/Dto/Request/FinancialTerminal/QueryAuditPayBillRequest.cs create mode 100644 BBWY.Server.Model/Dto/Response/FinancialTerminal/AuditPayBillResponse.cs diff --git a/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs b/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs index 27bdb4b4..b9c130c6 100644 --- a/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs +++ b/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs @@ -1,15 +1,49 @@ using BBWY.Common.Models; +using BBWY.Server.Model.Db; +using BBWY.Server.Model.Dto; +using System.Collections.Generic; +using System.Linq; using Yitter.IdGenerator; namespace BBWY.Server.Business { - public class FinancialTerminalBusiness: BaseBusiness, IDenpendency + public class FinancialTerminalBusiness : BaseBusiness, IDenpendency { public FinancialTerminalBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator) - { - + { + + } + + public IList GetAuditPayBillList(QueryAuditPayBillRequest request) + { + request.EndDate = request.EndDate.Date.AddDays(1).AddSeconds(-1); + return fsql.Select().Where(apb => apb.ImportShopIds == request.ImportShopIds && + apb.PayTime >= request.StartDate && + apb.PayTime <= request.EndDate).ToList(); } + public bool IsExistAuditPayBill(QueryAuditPayBillRequest request) + { + request.EndDate = request.EndDate.Date.AddDays(1).AddSeconds(-1); + return fsql.Select().Where(apb => apb.ImportShopIds == request.ImportShopIds && + apb.PayTime >= request.StartDate && + apb.PayTime <= request.EndDate).Any(); + } + public void BatchInsertAuditPayBill(List insertList) + { + var importShopIds = insertList[0].ImportShopIds; + var startTime = insertList.Min(abp => abp.PayTime).Value; + var endTime = insertList.Max(abp => abp.PayTime).Value; + + + fsql.Transaction(() => + { + fsql.Delete().Where(apb => apb.ImportShopIds == importShopIds && + apb.PayTime >= startTime && + apb.PayTime <= endTime).ExecuteAffrows(); + fsql.Insert(insertList).ExecuteAffrows(); + }); + } } } diff --git a/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs b/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs index bcea873d..08d148a3 100644 --- a/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs +++ b/BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs @@ -101,6 +101,10 @@ namespace BBWY.Server.Model.Db public string SourceMerchantOrderNo { get; set; } + /// + /// 导入时选择的店铺 + /// + public string ImportShopIds { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Request/FinancialTerminal/QueryAuditPayBillRequest.cs b/BBWY.Server.Model/Dto/Request/FinancialTerminal/QueryAuditPayBillRequest.cs new file mode 100644 index 00000000..c5031448 --- /dev/null +++ b/BBWY.Server.Model/Dto/Request/FinancialTerminal/QueryAuditPayBillRequest.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Server.Model.Dto +{ + public class QueryAuditPayBillRequest + { + public string ImportShopIds { get; set; } + public DateTime StartDate { get; set; } + public DateTime EndDate { get; set; } + } +} diff --git a/BBWY.Server.Model/Dto/Response/FinancialTerminal/AuditPayBillResponse.cs b/BBWY.Server.Model/Dto/Response/FinancialTerminal/AuditPayBillResponse.cs new file mode 100644 index 00000000..5bfa6dfa --- /dev/null +++ b/BBWY.Server.Model/Dto/Response/FinancialTerminal/AuditPayBillResponse.cs @@ -0,0 +1,9 @@ +using BBWY.Server.Model.Db; + +namespace BBWY.Server.Model.Dto +{ + public class AuditPayBillResponse: AuditPayBill + { + + } +}