整理代码

src/Hotline.Api/Controllers/Snapshot/IndustryController.cs

@@ -74,7 +74,7 @@ public class IndustryController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("industry")]
-    public async Task<PagedDto<IndustryItemsOutDto>> GetIndustryAsync([FromQuery] IndustryListInDto dto)
+    public async Task<PagedDto<IndustryItemsOutDto>> GetIndustres([FromQuery] IndustryListInDto dto)
         => (await _industryApplication.GetIndustres(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
 
     /// <summary>
@@ -93,7 +93,7 @@ public class IndustryController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("case")]
-    public async Task<PagedDto<IndustryCaseItemOutDto>> GetIndustryCaseItemAsync([FromQuery] IndustryCaseItemInDto dto)
+    public async Task<PagedDto<IndustryCaseItemOutDto>> GetIndustryCaseItems([FromQuery] IndustryCaseItemInDto dto)
         => (await _industryApplication.GetIndustryCaseItems(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
 
     /// <summary>
@@ -147,7 +147,7 @@ public class IndustryController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("sms_template")]
-    public async Task<PagedDto<SnapshotSMSTemplateItemsOutDto>> GetSmsTemplateItemsAsync([FromQuery] SnapshotSMSTemplateItemsInDto dto)
+    public async Task<PagedDto<SnapshotSMSTemplateItemsOutDto>> GetSMSTemplates([FromQuery] SnapshotSMSTemplateItemsInDto dto)
         => (await _industryApplication.GetSMSTemplates(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
 
     /// <summary>
@@ -193,8 +193,8 @@ public class IndustryController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("practitioner")]
-    public async Task<PagedDto<PractitionerItemsOutDto>> GetPractitionerItemsAsync([FromQuery] PractitionerItemsInDto dto)
-        => (await _industryApplication.GetPractitionerItemsAsync(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
+    public async Task<PagedDto<PractitionerItemsOutDto>> GetPractitionerItems([FromQuery] PractitionerItemsInDto dto)
+        => (await _industryApplication.GetPractitionerItems(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
 
     /// <summary>
     /// 添加区域从业人员
@@ -255,8 +255,8 @@ public class IndustryController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("volunteer")]
-    public async Task<PagedDto<VolunteerItemsOutDto>> GetVolunteerItemsAsync([FromQuery] VolunteerItemsInDto dto)
-        => (await _industryApplication.GetVolunteerItemsAsync(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
+    public async Task<PagedDto<VolunteerItemsOutDto>> GetVolunteerItems([FromQuery] VolunteerItemsInDto dto)
+        => (await _industryApplication.GetVolunteerItems(dto).ToPagedListAsync(dto, HttpContext.RequestAborted)).ToPaged();
 
     /// <summary>
     /// 添加志愿者
@@ -300,8 +300,8 @@ public class IndustryController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("volunteer/report")]
-    public async Task<PagedDto<VolunteerReportItemsOutDto>> GetVolunteerReportItemsAsync([FromQuery] VolunteerReportItemsInDto dto)
-        => (await _industryApplication.GetVolunteerReportItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<VolunteerReportItemsOutDto>> GetVolunteerReportItems([FromQuery] VolunteerReportItemsInDto dto)
+        => (await _industryApplication.GetVolunteerReportItems(dto).ToPagedListAsync(dto)).ToPaged();
     #endregion
 
     #region 修改行业记录
@@ -311,7 +311,7 @@ public class IndustryController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("order/industry/log")]
-    public async Task<PagedDto<IndustryLogItemsOutDto>> GetIndustryLogItemsAsync([FromQuery] IndustryLogItemsInDto dto)
-        => (await _industryApplication.GetIndustryLogItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<IndustryLogItemsOutDto>> GetIndustryLogItems([FromQuery] IndustryLogItemsInDto dto)
+        => (await _industryApplication.GetIndustryLogItems(dto).ToPagedListAsync(dto)).ToPaged();
     #endregion
 }

src/Hotline.Api/Controllers/Snapshot/InviteCodeController.cs

@@ -32,7 +32,7 @@ public class InviteCodeController : BaseController
     {
         return new Dictionary<string, object>
         {
-            { "OrgName", await _inviteCodeApplication.GetInviteCodeItemsAsync().Where(m => m.ParentOrgId == null)
+            { "OrgName", await _inviteCodeApplication.GetInviteCodeItems().Where(m => m.ParentOrgId == null)
             .Select(m => new Kv{ Key = m.Id, Value = m.OrgName}).ToListAsync() }
         };
     }
@@ -42,8 +42,8 @@ public class InviteCodeController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet]
-    public async Task<PagedDto<InviteCode>> GetInviteCodeItemsAsync([FromQuery] GetInviteCodeItemsInDto dto)
-        => (await _inviteCodeApplication.GetInviteCodeItemsAsync().ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<InviteCode>> GetInviteCodeItems([FromQuery] GetInviteCodeItemsInDto dto)
+        => (await _inviteCodeApplication.GetInviteCodeItems().ToPagedListAsync(dto)).ToPaged();
 
 
     /// <summary>
@@ -62,7 +62,7 @@ public class InviteCodeController : BaseController
 
     [HttpGet("{id}")]
     public async Task<InviteCode> GetInviteCodeDetailAsync( string id)
-        => await _inviteCodeApplication.GetInviteCodeItemsAsync().Where(m => m.Id == id).FirstAsync();
+        => await _inviteCodeApplication.GetInviteCodeItems().Where(m => m.Id == id).FirstAsync();
 
     /// <summary>
     /// 修改邀请码
@@ -97,6 +97,6 @@ public class InviteCodeController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("statistic/detail")]
-    public async Task<PagedDto<InviteCodeStatisticDetailOutDto>> GetInviteCodeStatisticDetailAsync([FromQuery] GetInviteCodeStatisticDetailInDto dto)
-        => (await _inviteCodeApplication.GetInviteCodeStatisticDetailAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<InviteCodeStatisticDetailOutDto>> GetInviteCodeStatisticDetail([FromQuery] GetInviteCodeStatisticDetailInDto dto)
+        => (await _inviteCodeApplication.GetInviteCodeStatisticDetail(dto).ToPagedListAsync(dto)).ToPaged();
 }

src/Hotline.Api/Controllers/Snapshot/RedPackController.cs

@@ -35,16 +35,16 @@ public class RedPackController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("audit")]
-    public async Task<PagedDto<SnapshotOrderAuditItemsOutDto>> GetRedPackAuditItemsAsync([FromQuery] SnapshotOrderAuditItemsInDto dto)
-        => (await _redPackApplication.GetRedPackAuditItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SnapshotOrderAuditItemsOutDto>> GetRedPackAuditItems([FromQuery] SnapshotOrderAuditItemsInDto dto)
+        => (await _redPackApplication.GetRedPackAuditItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 获取网格员红包审批集合(政法委或应急管理局:根据账号登录返回数据)
     /// </summary>
     /// <returns></returns>
     [HttpGet("audit/guider")]
-    public async Task<PagedDto<SnapshotOrderGuiderAuditItemsOutDto>> GetRedPackGuiderAuditItemsAsync([FromQuery] SnapshotOrderGuiderAuditItemsInDto dto)
-        => (await _redPackApplication.GetRedPackGuiderAuditItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SnapshotOrderGuiderAuditItemsOutDto>> GetRedPackGuiderAuditItems([FromQuery] SnapshotOrderGuiderAuditItemsInDto dto)
+        => (await _redPackApplication.GetRedPackGuiderAuditItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 获取网格员审核详情
@@ -162,8 +162,8 @@ public class RedPackController : BaseController
     /// 补充发放集合
     /// </summary>
     [HttpGet("record/supplement")]
-    public async Task<PagedDto<SnapshotRedPackRecordSupplementItemsOutDto>> GetRedPackRecordSupplementItemsAsync([FromQuery] SnapshotRedPackRecordSupplementItemsInDto dto)
-        => (await _redPackApplication.GetRedPackRecordSupplementItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SnapshotRedPackRecordSupplementItemsOutDto>> GetRedPackRecordSupplementItems([FromQuery] SnapshotRedPackRecordSupplementItemsInDto dto)
+        => (await _redPackApplication.GetRedPackRecordSupplementItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 红包审核通过或拒绝
@@ -214,8 +214,8 @@ public class RedPackController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("record")]
-    public async Task<PagedDto<SnapshotRedPackRecordItemsOutDto>> GetRedPackRecordItemsAsync([FromQuery] SnapshotRedPackRecordItemsInDto dto)
-        => (await _redPackApplication.GetRedPackRecordItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SnapshotRedPackRecordItemsOutDto>> GetRedPackRecordItems([FromQuery] SnapshotRedPackRecordItemsInDto dto)
+        => (await _redPackApplication.GetRedPackRecordItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 网格员红包发放记录
@@ -223,8 +223,8 @@ public class RedPackController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("record/guider")]
-    public async Task<PagedDto<SnapshotRedPackRecordItemsGuiderOutDto>> GetRedPackRecordGuiderItemsAsync([FromQuery] SnapshotRedPackRecordItemsGuiderInDto dto)
-        => (await _redPackApplication.GetRedPackRecordGuiderItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SnapshotRedPackRecordItemsGuiderOutDto>> GetRedPackRecordGuiderItems([FromQuery] SnapshotRedPackRecordItemsGuiderInDto dto)
+        => (await _redPackApplication.GetRedPackRecordGuiderItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 红包发放明细基础数据
@@ -248,8 +248,8 @@ public class RedPackController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("record/send")]
-    public async Task<PagedDto<SnapshotRedPackRecordSendOutDto>> GetRedPackRecordDetailAsync([FromQuery] SnapshotRedPackRecordSendInDto dto)
-        => (await _redPackApplication.GetRedPackRecordDetailAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SnapshotRedPackRecordSendOutDto>> GetRedPackRecordDetail([FromQuery] SnapshotRedPackRecordSendInDto dto)
+        => (await _redPackApplication.GetRedPackRecordDetail(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 批量发送红包

src/Hotline.Api/Controllers/Snapshot/SnapshotOrderController.cs

@@ -68,8 +68,8 @@ public class SnapshotOrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("order")]
-    public async Task<PagedDto<OrderSnapshotItemsOutDto>> GetOrderSnapshotItemsAsync([FromQuery] OrderSnapshotItemsInDto dto)
-        => (await _orderSnapshotApplication.GetOrderSnapshotItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<OrderSnapshotItemsOutDto>> GetOrderSnapshotItems([FromQuery] OrderSnapshotItemsInDto dto)
+        => (await _orderSnapshotApplication.GetOrderSnapshotItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 随手拍所有工单页面基础信息
@@ -108,8 +108,8 @@ public class SnapshotOrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("guider/reply")]
-    public async Task<PagedDto<GuiderReplyItemsOutDto>> GetGuiderReplyItemsAsync([FromQuery] GuiderReplyItemsInDto dto)
-        => (await _orderSnapshotApplication.GetGuiderReplyItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<GuiderReplyItemsOutDto>> GetGuiderReplyItems([FromQuery] GuiderReplyItemsInDto dto)
+        => (await _orderSnapshotApplication.GetGuiderReplyItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 获取工单标注集合
@@ -117,8 +117,8 @@ public class SnapshotOrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("label")]
-    public async Task<PagedDto<SignOrderSnapshotItemsOutDto>> GetSignOrderSnapshotItemsAsync([FromQuery] SignOrderSnapshotItemsInDto dto)
-        => (await _orderSnapshotApplication.GetSignOrderSnapshotItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SignOrderSnapshotItemsOutDto>> GetSignOrderSnapshotItems([FromQuery] SignOrderSnapshotItemsInDto dto)
+        => (await _orderSnapshotApplication.GetSignOrderSnapshotItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 获取工单已经标签集合
@@ -126,8 +126,8 @@ public class SnapshotOrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("labeled")]
-    public async Task<PagedDto<LabeledOrderSnapshotItemsOutDto>> GetLabeledOrderSnapshotItemsAsync([FromQuery] LabeledOrderSnapshotItemsInDto dto)
-        => (await _orderSnapshotApplication.GetLabeledOrderSnapshotItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<LabeledOrderSnapshotItemsOutDto>> GetLabeledOrderSnapshotItems([FromQuery] LabeledOrderSnapshotItemsInDto dto)
+        => (await _orderSnapshotApplication.GetLabeledOrderSnapshotItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 标签详情
@@ -161,8 +161,8 @@ public class SnapshotOrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("label/log")]
-    public async Task<PagedDto<LabelOrderSnapshotLogItemsOutDto>> GetLabelOrderSnapshotLogItemsAsync([FromQuery] LabelOrderSnapshotLogItemsInDto dto)
-        => (await _orderSnapshotApplication.GetLabelOrderSnapshotLogItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<LabelOrderSnapshotLogItemsOutDto>> GetLabelOrderSnapshotLogItems([FromQuery] LabelOrderSnapshotLogItemsInDto dto)
+        => (await _orderSnapshotApplication.GetLabelOrderSnapshotLogItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 随手拍公开集合
@@ -170,8 +170,8 @@ public class SnapshotOrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("publish")]
-    public async Task<PagedDto<GetOrderSnapshotPublishItemsOutDto>> GetOrderSnapshotPublishItemsAsync([FromQuery] GetOrderSnapshotPublishItemsInDto dto)
-        => (await _orderSnapshotApplication.GetOrderSnapshotPublishItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<GetOrderSnapshotPublishItemsOutDto>> GetOrderSnapshotPublishItems([FromQuery] GetOrderSnapshotPublishItemsInDto dto)
+        => (await _orderSnapshotApplication.GetOrderSnapshotPublishItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 随手拍公开详情
@@ -195,8 +195,8 @@ public class SnapshotOrderController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("publish/audit")]
-    public async Task<PagedDto<GetOrderSnapshotPublishAuditItemsOutDto>> GetOrderSnapshotPublishAuditItemsAsync([FromQuery] GetOrderSnapshotPublishAuditItemsInDto dto)
-        => (await _orderSnapshotApplication.GetOrderSnapshotPublishAuditItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<GetOrderSnapshotPublishAuditItemsOutDto>> GetOrderSnapshotPublishAuditItems([FromQuery] GetOrderSnapshotPublishAuditItemsInDto dto)
+        => (await _orderSnapshotApplication.GetOrderSnapshotPublishAuditItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 审核随手拍公开申请通过/不通过

src/Hotline.Application.Tests/Application/InviteCodeApplicationTest.cs

@@ -37,7 +37,7 @@ public class InviteCodeApplicationTest : TestBase
 
         await _inviteCodeApplication.AddInviteCodeAsync(inDto);
 
-        var items = _inviteCodeApplication.GetInviteCodeItemsAsync().ToList();
+        var items = _inviteCodeApplication.GetInviteCodeItems().ToList();
         items.Count.ShouldNotBe(0);
 
         var statics = await _inviteCodeApplication.GetInviteCodeStatisticAsync(new GetInviteCodeStatisticInDto 

src/Hotline.Application.Tests/Application/OrderSnapshotApplicationTest.cs

@@ -65,11 +65,11 @@ public class OrderSnapshotApplicationTest : TestBase
 
         snapshot.IsSafetyDepartment.ShouldBe(false);
 
-        var labelLog = await _orderSnapshotApplication.GetLabelOrderSnapshotLogItemsAsync(new LabelOrderSnapshotLogItemsInDto()).ToPagedListAsync(new PagedRequest());
+        var labelLog = await _orderSnapshotApplication.GetLabelOrderSnapshotLogItems(new LabelOrderSnapshotLogItemsInDto()).ToPagedListAsync(new PagedRequest());
         labelLog.Items.Any(m => m.Title.IsNullOrEmpty()).ShouldBe(false);
         labelLog.Items.Any(m => m.SourceChannel.IsNullOrEmpty()).ShouldBe(false);
 
-        var sigedItems = await _orderSnapshotApplication.GetLabeledOrderSnapshotItemsAsync(new LabeledOrderSnapshotItemsInDto()).ToListAsync();
+        var sigedItems = await _orderSnapshotApplication.GetLabeledOrderSnapshotItems(new LabeledOrderSnapshotItemsInDto()).ToListAsync();
         sigedItems.Any(m => m.OrderId == order.Id).ShouldBe(true);
     }
 }

src/Hotline.Application.Tests/Application/RedPackApplicationTest.cs

@@ -39,7 +39,7 @@ public class RedPackApplicationTest : TestBase
     [Fact]
     public async Task AuditRedPackAudit_Test()
     {
-        var items = await _redPackApplication.GetRedPackAuditItemsAsync(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 0)).ToListAsync();
+        var items = await _redPackApplication.GetRedPackAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 0)).ToListAsync();
         var audit = items.First();
         var smsTemplate = await _redPackApplication.GetRedPackAuditSMSTemplateAsync(new GetRedPackAuditSMSTemplateInDto(audit.OrderId, ESnapshotSMSStatus.Agree));
         var inDto = new UpdateRedPackAuditInDto
@@ -66,14 +66,14 @@ public class RedPackApplicationTest : TestBase
         };
         await _redPackApplication.UpdateRedPackRecordAsync(suInDto);
 
-        items = await _redPackApplication.GetRedPackAuditItemsAsync(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 1)).ToListAsync();
+        items = await _redPackApplication.GetRedPackAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 1)).ToListAsync();
         items.Any(m => m.Id == audit.Id).ShouldBeTrue();
 
         var record = await _redPackRecordRepository.Queryable()
             .Where(m => m.OrderId == audit.OrderId)
             .FirstAsync();
         record.ShouldNotBeNull();
-        var recordItems = await _redPackApplication.GetRedPackRecordItemsAsync(new SnapshotRedPackRecordItemsInDto { Status =2}).ToListAsync();
+        var recordItems = await _redPackApplication.GetRedPackRecordItems(new SnapshotRedPackRecordItemsInDto { Status =2}).ToListAsync();
         recordItems.Count.ShouldNotBe(0);
 
         var redPackRecord = recordItems.First();
@@ -83,7 +83,7 @@ public class RedPackApplicationTest : TestBase
         redPackRecordEntity.ReceiveTime = DateTime.Now;
         await _redPackRecordRepository.UpdateAsync(redPackRecordEntity);
 
-        var sendRecordItems = await _redPackApplication.GetRedPackRecordDetailAsync(new SnapshotRedPackRecordSendInDto
+        var sendRecordItems = await _redPackApplication.GetRedPackRecordDetail(new SnapshotRedPackRecordSendInDto
         {
             IsReceive = true,
         }).ToListAsync();

src/Hotline.Application.Tests/Application/SnapshotApplicationTest.cs

@@ -76,14 +76,14 @@ public class SnapshotApplicationTest : TestBase
     [Fact]
     public async Task GetOrderSnapshotPublishItemsAsync()
     {
-        var items = await _orderSnapshotApplication.GetOrderSnapshotPublishItemsAsync(new GetOrderSnapshotPublishItemsInDto()).ToPageListAsync(0, 10);
+        var items = await _orderSnapshotApplication.GetOrderSnapshotPublishItems(new GetOrderSnapshotPublishItemsInDto()).ToPageListAsync(0, 10);
         items.NotNullOrEmpty().ShouldBeTrue();
-        items = await _orderSnapshotApplication.GetOrderSnapshotPublishItemsAsync(new GetOrderSnapshotPublishItemsInDto
+        items = await _orderSnapshotApplication.GetOrderSnapshotPublishItems(new GetOrderSnapshotPublishItemsInDto
         {
             OrderStatus = EOrderStatus.Filed
         }).ToPageListAsync(0, 10);
         items.NotNullOrEmpty().ShouldBeTrue();
-        items = await _orderSnapshotApplication.GetOrderSnapshotPublishItemsAsync(new GetOrderSnapshotPublishItemsInDto
+        items = await _orderSnapshotApplication.GetOrderSnapshotPublishItems(new GetOrderSnapshotPublishItemsInDto
         {
             IsPublished = true
         }).ToPageListAsync(0, 10);
@@ -193,7 +193,7 @@ public class SnapshotApplicationTest : TestBase
         orderPublishDetail.Workflow.Any(m => m.Name.IsNullOrEmpty()).ShouldBeFalse();
         await _snapshotApplication.AddRedPardAsync(order.Id, CancellationToken.None);
         var guiderItems = await _redPackApplication
-            .GetRedPackGuiderAuditItemsAsync(new SnapshotOrderGuiderAuditItemsInDto(null, null, -1))
+            .GetRedPackGuiderAuditItems(new SnapshotOrderGuiderAuditItemsInDto(null, null, -1))
             .ToListAsync();
         guiderItems.Count.ShouldNotBe(0);
     }

src/Hotline.Application/Snapshot/IIndustryApplication.cs

@@ -99,7 +99,7 @@ public interface IIndustryApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<PractitionerItemsOutDto> GetPractitionerItemsAsync(PractitionerItemsInDto dto);
+    ISugarQueryable<PractitionerItemsOutDto> GetPractitionerItems(PractitionerItemsInDto dto);
 
     /// <summary>
     /// 删除区域从业人员
@@ -134,7 +134,7 @@ public interface IIndustryApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<VolunteerItemsOutDto> GetVolunteerItemsAsync(VolunteerItemsInDto dto);
+    ISugarQueryable<VolunteerItemsOutDto> GetVolunteerItems(VolunteerItemsInDto dto);
 
     /// <summary>
     /// 添加志愿者
@@ -169,14 +169,14 @@ public interface IIndustryApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<VolunteerReportItemsOutDto> GetVolunteerReportItemsAsync(VolunteerReportItemsInDto dto);
+    ISugarQueryable<VolunteerReportItemsOutDto> GetVolunteerReportItems(VolunteerReportItemsInDto dto);
 
     /// <summary>
     /// 行业修改记录
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<IndustryLogItemsOutDto> GetIndustryLogItemsAsync(IndustryLogItemsInDto dto);
+    ISugarQueryable<IndustryLogItemsOutDto> GetIndustryLogItems(IndustryLogItemsInDto dto);
 
     /// <summary>
     /// 删除行业短信模板

src/Hotline.Application/Snapshot/IInviteCodeApplication.cs

@@ -19,7 +19,7 @@ public interface IInviteCodeApplication
     /// <param name="ids"></param>
     /// <returns></returns>
     Task DeleteInviteCodeAsync(IList<string> ids);
-    ISugarQueryable<InviteCode> GetInviteCodeItemsAsync();
+    ISugarQueryable<InviteCode> GetInviteCodeItems();
 
     /// <summary>
     /// 邀请码统计
@@ -33,7 +33,7 @@ public interface IInviteCodeApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<InviteCodeStatisticDetailOutDto> GetInviteCodeStatisticDetailAsync(GetInviteCodeStatisticDetailInDto dto);
+    ISugarQueryable<InviteCodeStatisticDetailOutDto> GetInviteCodeStatisticDetail(GetInviteCodeStatisticDetailInDto dto);
 
     /// <summary>
     /// 修改邀请码

src/Hotline.Application/Snapshot/IOrderSnapshotApplication.cs

@@ -34,13 +34,13 @@ public interface IOrderSnapshotApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<GuiderReplyItemsOutDto> GetGuiderReplyItemsAsync(GuiderReplyItemsInDto dto);
+    ISugarQueryable<GuiderReplyItemsOutDto> GetGuiderReplyItems(GuiderReplyItemsInDto dto);
 
     /// <summary>
     /// 随手拍公开审批集合
     /// </summary>
     /// <returns></returns>
-    ISugarQueryable<GetOrderSnapshotPublishAuditItemsOutDto> GetOrderSnapshotPublishAuditItemsAsync(GetOrderSnapshotPublishAuditItemsInDto dto);
+    ISugarQueryable<GetOrderSnapshotPublishAuditItemsOutDto> GetOrderSnapshotPublishAuditItems(GetOrderSnapshotPublishAuditItemsInDto dto);
 
     /// <summary>
     /// 随手拍公开详情
@@ -54,14 +54,14 @@ public interface IOrderSnapshotApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<GetOrderSnapshotPublishItemsOutDto> GetOrderSnapshotPublishItemsAsync(GetOrderSnapshotPublishItemsInDto dto);
+    ISugarQueryable<GetOrderSnapshotPublishItemsOutDto> GetOrderSnapshotPublishItems(GetOrderSnapshotPublishItemsInDto dto);
 
     /// <summary>
     /// 获取工单标签集合
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItemsAsync(SignOrderSnapshotItemsInDto dto);
+    ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItems(SignOrderSnapshotItemsInDto dto);
 
     /// <summary>
     /// 批量设置随手拍公开申请不通过
@@ -95,7 +95,7 @@ public interface IOrderSnapshotApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<LabelOrderSnapshotLogItemsOutDto> GetLabelOrderSnapshotLogItemsAsync(LabelOrderSnapshotLogItemsInDto dto);
+    ISugarQueryable<LabelOrderSnapshotLogItemsOutDto> GetLabelOrderSnapshotLogItems(LabelOrderSnapshotLogItemsInDto dto);
 
     /// <summary>
     /// 返回办理页面基础数据
@@ -110,14 +110,14 @@ public interface IOrderSnapshotApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<OrderSnapshotItemsOutDto> GetOrderSnapshotItemsAsync(OrderSnapshotItemsInDto dto);
+    ISugarQueryable<OrderSnapshotItemsOutDto> GetOrderSnapshotItems(OrderSnapshotItemsInDto dto);
 
     /// <summary>
     /// 获取工单已经标签集合
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<LabeledOrderSnapshotItemsOutDto> GetLabeledOrderSnapshotItemsAsync(LabeledOrderSnapshotItemsInDto dto);
+    ISugarQueryable<LabeledOrderSnapshotItemsOutDto> GetLabeledOrderSnapshotItems(LabeledOrderSnapshotItemsInDto dto);
 
     /// <summary>
     /// 工单标记

src/Hotline.Application/Snapshot/IRedPackApplication.cs

@@ -42,7 +42,7 @@ public interface IRedPackApplication
     /// 获取市民红包审批列表
     /// </summary>
     /// <returns></returns>
-    ISugarQueryable<SnapshotOrderAuditItemsOutDto> GetRedPackAuditItemsAsync(SnapshotOrderAuditItemsInDto dto);
+    ISugarQueryable<SnapshotOrderAuditItemsOutDto> GetRedPackAuditItems(SnapshotOrderAuditItemsInDto dto);
 
     /// <summary>
     /// 获取审核短信模板
@@ -63,28 +63,28 @@ public interface IRedPackApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<SnapshotOrderGuiderAuditItemsOutDto> GetRedPackGuiderAuditItemsAsync(SnapshotOrderGuiderAuditItemsInDto dto);
+    ISugarQueryable<SnapshotOrderGuiderAuditItemsOutDto> GetRedPackGuiderAuditItems(SnapshotOrderGuiderAuditItemsInDto dto);
 
     /// <summary>
     /// 红包发放明细
     /// </summary>
     /// <returns></returns>
-    ISugarQueryable<SnapshotRedPackRecordSendOutDto> GetRedPackRecordDetailAsync(SnapshotRedPackRecordSendInDto dto);
+    ISugarQueryable<SnapshotRedPackRecordSendOutDto> GetRedPackRecordDetail(SnapshotRedPackRecordSendInDto dto);
 
     /// <summary>
     /// 网格员红包发放记录
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<SnapshotRedPackRecordItemsGuiderOutDto> GetRedPackRecordGuiderItemsAsync(SnapshotRedPackRecordItemsGuiderInDto dto);
+    ISugarQueryable<SnapshotRedPackRecordItemsGuiderOutDto> GetRedPackRecordGuiderItems(SnapshotRedPackRecordItemsGuiderInDto dto);
 
     /// <summary>
     /// 市民红包发放记录
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<SnapshotRedPackRecordItemsOutDto> GetRedPackRecordItemsAsync(SnapshotRedPackRecordItemsInDto dto);
-    ISugarQueryable<SnapshotRedPackRecordSupplementItemsOutDto> GetRedPackRecordSupplementItemsAsync(SnapshotRedPackRecordSupplementItemsInDto dto);
+    ISugarQueryable<SnapshotRedPackRecordItemsOutDto> GetRedPackRecordItems(SnapshotRedPackRecordItemsInDto dto);
+    ISugarQueryable<SnapshotRedPackRecordSupplementItemsOutDto> GetRedPackRecordSupplementItems(SnapshotRedPackRecordSupplementItemsInDto dto);
 
     /// <summary>
     /// 审核添加备注

src/Hotline.Application/Snapshot/IndustryApplication.cs

@@ -245,7 +245,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    public ISugarQueryable<PractitionerItemsOutDto> GetPractitionerItemsAsync(PractitionerItemsInDto dto)
+    public ISugarQueryable<PractitionerItemsOutDto> GetPractitionerItems(PractitionerItemsInDto dto)
     {
         var query = _practitionerRepository.Queryable()
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name!))
@@ -316,7 +316,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    public ISugarQueryable<VolunteerItemsOutDto> GetVolunteerItemsAsync(VolunteerItemsInDto dto)
+    public ISugarQueryable<VolunteerItemsOutDto> GetVolunteerItems(VolunteerItemsInDto dto)
     {
         var query = _volunteerRepository.Queryable()
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name))
@@ -379,7 +379,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<VolunteerReportItemsOutDto> GetVolunteerReportItemsAsync(VolunteerReportItemsInDto dto)
+    public ISugarQueryable<VolunteerReportItemsOutDto> GetVolunteerReportItems(VolunteerReportItemsInDto dto)
     {
         var query = _volunteerReportRepository.Queryable()
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name))
@@ -394,7 +394,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<IndustryLogItemsOutDto> GetIndustryLogItemsAsync(IndustryLogItemsInDto dto)
+    public ISugarQueryable<IndustryLogItemsOutDto> GetIndustryLogItems(IndustryLogItemsInDto dto)
     {
         var query = _industryLogRepository.Queryable()
             .WhereIF(dto.No.NotNullOrEmpty(), m => m.No.Contains(dto.No))

src/Hotline.Application/Snapshot/InviteCodeApplication.cs

@@ -59,7 +59,7 @@ public class InviteCodeApplication : IInviteCodeApplication, IScopeDependency
             });
     }
 
-    public ISugarQueryable<InviteCode> GetInviteCodeItemsAsync()
+    public ISugarQueryable<InviteCode> GetInviteCodeItems()
     {
         return _inviteCodeRepository.Queryable();
     }
@@ -85,7 +85,7 @@ public class InviteCodeApplication : IInviteCodeApplication, IScopeDependency
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<InviteCodeStatisticDetailOutDto> GetInviteCodeStatisticDetailAsync(GetInviteCodeStatisticDetailInDto dto)
+    public ISugarQueryable<InviteCodeStatisticDetailOutDto> GetInviteCodeStatisticDetail(GetInviteCodeStatisticDetailInDto dto)
     {
         dto.ValidateObject();
         var query = _inviteCodeRecordRepository.Queryable()

src/Hotline.Application/Snapshot/OrderSnapshotApplication.cs

@@ -89,7 +89,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<GuiderReplyItemsOutDto> GetGuiderReplyItemsAsync(GuiderReplyItemsInDto dto)
+    public ISugarQueryable<GuiderReplyItemsOutDto> GetGuiderReplyItems(GuiderReplyItemsInDto dto)
     {
         var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
@@ -114,7 +114,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// 随手拍公开审批集合
     /// </summary>
     /// <returns></returns>
-    public ISugarQueryable<GetOrderSnapshotPublishAuditItemsOutDto> GetOrderSnapshotPublishAuditItemsAsync(GetOrderSnapshotPublishAuditItemsInDto dto)
+    public ISugarQueryable<GetOrderSnapshotPublishAuditItemsOutDto> GetOrderSnapshotPublishAuditItems(GetOrderSnapshotPublishAuditItemsInDto dto)
     {
         var query = _snapshotOrderPublishRepository.Queryable()
             .LeftJoin<Order>((publish, order) => publish.OrderId == order.Id)
@@ -169,7 +169,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<GetOrderSnapshotPublishItemsOutDto> GetOrderSnapshotPublishItemsAsync(GetOrderSnapshotPublishItemsInDto dto)
+    public ISugarQueryable<GetOrderSnapshotPublishItemsOutDto> GetOrderSnapshotPublishItems(GetOrderSnapshotPublishItemsInDto dto)
     {
         var query = _orderSnapshotRepository.Queryable(includeDeleted: true)
             .LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
@@ -200,7 +200,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItemsAsync(SignOrderSnapshotItemsInDto dto)
+    public ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItems(SignOrderSnapshotItemsInDto dto)
     {
         var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
@@ -352,7 +352,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<LabelOrderSnapshotLogItemsOutDto> GetLabelOrderSnapshotLogItemsAsync(LabelOrderSnapshotLogItemsInDto dto)
+    public ISugarQueryable<LabelOrderSnapshotLogItemsOutDto> GetLabelOrderSnapshotLogItems(LabelOrderSnapshotLogItemsInDto dto)
     {
         var query = _snapshotLabelLogRepository.Queryable()
             .LeftJoin<Order>((log, order) => log.OrderId == order.Id)
@@ -424,7 +424,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
 
     }
 
-    public ISugarQueryable<OrderSnapshotItemsOutDto> GetOrderSnapshotItemsAsync(OrderSnapshotItemsInDto dto)
+    public ISugarQueryable<OrderSnapshotItemsOutDto> GetOrderSnapshotItems(OrderSnapshotItemsInDto dto)
     {
         var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
@@ -444,7 +444,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<LabeledOrderSnapshotItemsOutDto> GetLabeledOrderSnapshotItemsAsync(LabeledOrderSnapshotItemsInDto dto)
+    public ISugarQueryable<LabeledOrderSnapshotItemsOutDto> GetLabeledOrderSnapshotItems(LabeledOrderSnapshotItemsInDto dto)
     {
         var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => order.Id == snapshot.Id)

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -204,7 +204,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <returns></returns>
     [Description("市民红包审批")]
-    public ISugarQueryable<SnapshotOrderAuditItemsOutDto> GetRedPackAuditItemsAsync(SnapshotOrderAuditItemsInDto dto)
+    public ISugarQueryable<SnapshotOrderAuditItemsOutDto> GetRedPackAuditItems(SnapshotOrderAuditItemsInDto dto)
     {
         ERedPackAuditStatus? status = null;
         if (dto.Status != -1 && Enum.TryParse<ERedPackAuditStatus>(dto.Status.ToString(), out var statusParse))
@@ -282,7 +282,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <returns></returns>
     [Description("网格员红包审批")]
-    public ISugarQueryable<SnapshotOrderGuiderAuditItemsOutDto> GetRedPackGuiderAuditItemsAsync(SnapshotOrderGuiderAuditItemsInDto dto)
+    public ISugarQueryable<SnapshotOrderGuiderAuditItemsOutDto> GetRedPackGuiderAuditItems(SnapshotOrderGuiderAuditItemsInDto dto)
     {
         var areaCode = _sessionContext.OrgAreaCode;
         if (_sessionContext.OrgIsCenter)
@@ -430,7 +430,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <returns></returns>
     [Description("市民红包发放记录")]
-    public ISugarQueryable<SnapshotRedPackRecordItemsOutDto> GetRedPackRecordItemsAsync(SnapshotRedPackRecordItemsInDto dto)
+    public ISugarQueryable<SnapshotRedPackRecordItemsOutDto> GetRedPackRecordItems(SnapshotRedPackRecordItemsInDto dto)
     {
         var query = _redPackRecordRepository.Queryable()
             .Where(m => m.PeopleType == EReadPackUserType.Citizen)
@@ -467,7 +467,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     }
 
     [Description("网格员红包发放记录")]
-    public ISugarQueryable<SnapshotRedPackRecordItemsGuiderOutDto> GetRedPackRecordGuiderItemsAsync(SnapshotRedPackRecordItemsGuiderInDto dto)
+    public ISugarQueryable<SnapshotRedPackRecordItemsGuiderOutDto> GetRedPackRecordGuiderItems(SnapshotRedPackRecordItemsGuiderInDto dto)
     {
         var query = _redPackRecordRepository.Queryable()
             .Where(m => m.PeopleType == EReadPackUserType.Guider)
@@ -488,7 +488,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     }
 
     [Description("红包发放明细")]
-    public ISugarQueryable<SnapshotRedPackRecordSendOutDto> GetRedPackRecordDetailAsync(SnapshotRedPackRecordSendInDto dto)
+    public ISugarQueryable<SnapshotRedPackRecordSendOutDto> GetRedPackRecordDetail(SnapshotRedPackRecordSendInDto dto)
     {
         var query = _redPackRecordRepository.Queryable()
             .LeftJoin<OrderSnapshot>((m , snapshot) => m.OrderId == snapshot.Id)
@@ -520,7 +520,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <returns></returns>
     [Description("补充发放")]
-    public ISugarQueryable<SnapshotRedPackRecordSupplementItemsOutDto> GetRedPackRecordSupplementItemsAsync(SnapshotRedPackRecordSupplementItemsInDto dto)
+    public ISugarQueryable<SnapshotRedPackRecordSupplementItemsOutDto> GetRedPackRecordSupplementItems(SnapshotRedPackRecordSupplementItemsInDto dto)
     {
         var query = _supplementRecordRepository.Queryable()
             .LeftJoin<Order>((supp, order) => supp.OrderId == order.Id)

src/Hotline.WeChat/ServiceCollectionExtensions.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Senparc.Weixin.RegisterServices;
-using Castle.Core.Configuration;
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Builder;
 using Senparc.Weixin.AspNet;