合并

src/Hotline.Api/Controllers/OrderController.cs

@@ -57,7 +57,7 @@ using Hotline.Share.Mq;
 using Hotline.Share.Requests;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tools;
 using Hotline.Users;
 using Hotline.Validators.FlowEngine;

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

@@ -4,7 +4,6 @@ using Hotline.Share.Dtos.Snapshot;
 using Microsoft.AspNetCore.Mvc;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Settings.Hotspots;
 using Hotline.Share.Requests;
 using SqlSugar;
@@ -21,6 +20,7 @@ using Hotline.Share.Dtos.Settings;
 using XF.Domain.Repository;
 using Hotline.Configurations;
 using Microsoft.Extensions.Options;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Api.Controllers.Snapshot;
 

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

@@ -9,7 +9,7 @@ using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using SqlSugar;

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

@@ -4,7 +4,7 @@ using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel;
 

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

@@ -4,7 +4,6 @@ using Hotline.Share.Dtos.Snapshot;
 using Microsoft.AspNetCore.Mvc;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Caching.Interfaces;
 using XF.Utility.EnumExtensions;
 using Hotline.Share.Enums.Snapshot;
@@ -12,6 +11,7 @@ using Quartz.Impl.Triggers;
 using Hotline.Orders;
 using XF.Domain.Exceptions;
 using Mapster;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Api.Controllers.Snapshot;
 

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

@@ -1,6 +1,5 @@
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Article;
-using Hotline.Snapshot.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 using Hotline.Repository.SqlSugar.Extensions;
 using Mapster;
@@ -15,6 +14,7 @@ using Hotline.Snapshot;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
 using XF.Utility.EnumExtensions;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Api.Controllers.Snapshot;
 

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

@@ -17,7 +17,7 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Hotline.Tools;
 using Mapster;

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

@@ -17,7 +17,7 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;

src/Hotline.Api/StartupExtensions.cs

@@ -30,7 +30,6 @@ using Hotline.DI;
 using Hotline.Settings.TimeLimitDomain.ExpireTimeSupplier;
 using XF.Domain.Authentications;
 using Hotline.WeChat;
-using Hotline.Snapshot.Interfaces;
 using TianQue.Sdk;
 using Hotline.Orders;
 using XF.Domain.Repository.Events;
@@ -39,6 +38,7 @@ using Hotline.Ai.XingTang;
 using Hotline.Pdf;
 using Hotline.XingTang;
 using Hotline.ThirdAccountDomainServices.Interfaces;
+using Hotline.Snapshot.IRepository;
 
 
 namespace Hotline.Api;
@@ -201,7 +201,7 @@ internal static class StartupExtensions
         services.AddMq(configuration);
 
         //job
-        services.RegisterJob(appConfiguration);
+        //services.RegisterJob(appConfiguration);
 
         services.AddPdfManager();
 

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -23,7 +23,7 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Push;
 using Hotline.Share.Enums.Quality;
 using Hotline.Share.Mq;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Snapshot.Notifications;
 using Hotline.Users;
 using Mapster;

src/Hotline.Application/Identity/IdentityAppService.cs

@@ -17,7 +17,7 @@ using Hotline.Share.Enums.Identity;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Enums.User;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Hotline.Users;

src/Hotline.Application/Mappers/SnapshotMapperConfigs.cs

@@ -60,7 +60,7 @@ public class SnapshotMapperConfigs : IRegister
             .Map(m => m.Additions, n => n.AdditionId);
 
         config.ForType<SnapshotFileInDto, File.File>()
-            .Map(m => m.Additions, n => n.AdditionId);
+            .Map(m => m.Additions, n => n.Id);
 
         config.ForType<AddSnapshotOrderInDto, Order>()
             .Map(m => m.Contact, n => n.PhoneNumber)

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -4352,8 +4352,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
         var orderExtension = await _orderDomainService.GetOrderExtensionsAsync(dto.ReceiveProvinceNo, cancellationToken);
 
-        //  var order = await _orderRepository.GetAsync(d => d.ReceiveProvinceNo == dto.ReceiveProvinceNo, cancellationToken);
         var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.ReceiveProvinceNo == dto.ReceiveProvinceNo);
+
         //处理省下行数据，热点名称为空
         if (!string.IsNullOrEmpty(dto.HotspotId) && string.IsNullOrEmpty(dto.HotspotName))
         {

src/Hotline.Application/Snapshot/BiSnapshotApplication.cs

@@ -9,7 +9,7 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tools;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;

src/Hotline.Application/Snapshot/DefaultSnapshotApplication.cs

@@ -8,7 +8,7 @@ using Hotline.Orders;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using System;
 using System.Collections.Generic;

src/Hotline.Application/Snapshot/IndustryApplication.cs

@@ -9,7 +9,7 @@ using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tools;
 using Mapster;
 using SqlSugar;

src/Hotline.Application/Snapshot/InviteCodeApplication.cs

@@ -1,7 +1,7 @@
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tools;
 using Mapster;
 using SqlSugar;

src/Hotline.Application/Snapshot/Notifications/SnapshotHandler.cs

@@ -13,7 +13,6 @@ using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Mq;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Snapshot.Notifications;
 using MediatR;
 using System;
@@ -27,6 +26,7 @@ using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using Microsoft.Extensions.Logging;
 using Hotline.Orders.Notifications;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Application.Snapshot.Notifications;
 
@@ -158,3 +158,12 @@ public class AddOrderSpecialHandler : INotificationHandler<AddOrderSpecialNotify
         }
     }
 }
+
+public class SnapshotStartWorkFlow : INotificationHandler<StartWorkflowNotify>
+{
+     
+    public Task Handle(StartWorkflowNotify notification, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+}

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -11,7 +11,7 @@ using Hotline.Share.Enums.Push;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Mapster;
 using Microsoft.AspNetCore.Http;
@@ -49,8 +49,9 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     private readonly IPushDomainService _pushDomainService;
     private readonly ILogger<RedPackApplication> _logger;
     private readonly ISystemDicDataCacheManager _systemDic;
+    private readonly ISnapshotPointsRecordRepository _snapshotPointsRecordRepository;
 
-    public RedPackApplication(IOrderSnapshotRepository orderSnapshotRepository, ISnapshotSMSTemplateRepository snapshotSMSTemplateRepository, IOrderRepository orderRepository, IIndustryRepository industryRepository, IRedPackAuditRepository redPackAuditRepository, IRedPackRecordRepository redPackRecordRepository, IRepository<OrderSpecial> orderSpecialRepository, ISessionContext sessionContext, IRedPackGuiderAuditRepository redPackGuiderAuditRepository, IThirdAccountRepository thirdAccountRepository, ISupplementRecordRepository supplementRecordRepository, IPushDomainService pushDomainService, ILogger<RedPackApplication> logger, ISpecialRedPackAuditRepository specialRedPackAuditRepository, ISystemDicDataCacheManager systemDic)
+    public RedPackApplication(IOrderSnapshotRepository orderSnapshotRepository, ISnapshotSMSTemplateRepository snapshotSMSTemplateRepository, IOrderRepository orderRepository, IIndustryRepository industryRepository, IRedPackAuditRepository redPackAuditRepository, IRedPackRecordRepository redPackRecordRepository, IRepository<OrderSpecial> orderSpecialRepository, ISessionContext sessionContext, IRedPackGuiderAuditRepository redPackGuiderAuditRepository, IThirdAccountRepository thirdAccountRepository, ISupplementRecordRepository supplementRecordRepository, IPushDomainService pushDomainService, ILogger<RedPackApplication> logger, ISpecialRedPackAuditRepository specialRedPackAuditRepository, ISystemDicDataCacheManager systemDic, ISnapshotPointsRecordRepository snapshotPointsRecordRepository)
     {
         _orderSnapshotRepository = orderSnapshotRepository;
         _snapshotSMSTemplateRepository = snapshotSMSTemplateRepository;
@@ -67,6 +68,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         _logger = logger;
         _specialRedPackAuditRepository = specialRedPackAuditRepository;
         _systemDic = systemDic;
+        _snapshotPointsRecordRepository = snapshotPointsRecordRepository;
     }
 
     /// <summary>
@@ -79,7 +81,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         var status = ERedPackAuditStatus.Refuse;
         if (dto.Status == ESnapshotSMSStatus.Agree)
             status = ERedPackAuditStatus.Agree;
-        var redPackAudit = await _redPackAuditRepository.GetAsync(dto.RedPackAuditId) ?? throw UserFriendlyException.SameMessage("审核记录不存在");
+        var redPackAudit = await _redPackAuditRepository.GetAsync(dto.RedPackAuditId, token) ?? throw UserFriendlyException.SameMessage("审核记录不存在");
         if (redPackAudit.Status != ERedPackAuditStatus.Pending) throw UserFriendlyException.SameMessage("已审核, 不可重复审核");
         redPackAudit.SMSTemplateId = dto.SMSTemplateId;
         redPackAudit.Status = status;
@@ -232,9 +234,12 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         var outDto = new SnapshotOrderAuditDetailOutDto { Order = order.Adapt<SnapshotOrderAuditOrderDetailOutDto>() };
         var industry = await _industryRepository.Queryable(includeDeleted: true)
             .LeftJoin<OrderSnapshot>((i, o) => i.Id == o.IndustryId)
-            .Select((i, o) => new { i.Id, i.CitizenReadPackAmount })
+            .Select((i, o) => new { i.Id, i.CitizenReadPackAmount , i.ArgeePoints, i.ExtraDeductedPoints, i.RefusePoints})
             .FirstAsync();
         outDto.Amount = industry.CitizenReadPackAmount;
+        outDto.ArgeePoints = industry.ArgeePoints;
+        outDto.ExtraDeductedPoints = industry.ExtraDeductedPoints;
+        outDto.RefusePoints = industry.RefusePoints;
         outDto.RedPackTxt = $"{order.FromPhone}【】元; ";
         var dayStart = DateTime.Now.ToString("yyyy-MM-dd 00:00:00").ObjToDate();
         var dayEnd = DateTime.Now.ToString("yyyy-MM-dd 23:59:59").ObjToDate();
@@ -249,6 +254,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             outDto.RedPackTxt += $"今天审批【{count}】个";
 
         outDto.AuditComBox = EnumExts.GetDescriptions<ESnapshotSMSStatus>();
+        outDto.ExtraDeductionPointsType = _systemDic.ExtraDeductionPointsType;
         return outDto;
     }
 

src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -22,7 +22,6 @@ using Hotline.Share.Dtos.Settings;
 using Hotline.File;
 using Hotline.Share.Enums.Article;
 using Hotline.Tools;
-using Hotline.Snapshot.Interfaces;
 using DotNetCore.CAP;
 using Microsoft.AspNetCore.Http;
 using Hotline.Share.Dtos.FlowEngine;
@@ -35,6 +34,7 @@ using Hotline.EventBus;
 using Hotline.Quality.Notifications;
 using XF.Utility.EnumExtensions;
 using Hotline.ThirdAccountDomainServices.Interfaces;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Application.Snapshot;
 

src/Hotline.Application/Snapshot/SnapshotBulletinApplication.cs

@@ -2,7 +2,7 @@
 using Hotline.Settings;
 using Hotline.Share.Attributes;
 using Hotline.Share.Dtos.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Microsoft.AspNetCore.Http;
 using SqlSugar;
 using System;

src/Hotline.Application/Snapshot/SnapshotOrderApplication.cs

@@ -14,7 +14,6 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Tools;
 using Mapster;
 using Novacode.NETCorePort;
@@ -31,6 +30,7 @@ using XF.Domain.Authentications;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Utility.EnumExtensions;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Application.Snapshot;
 public class SnapshotOrderApplication : IOrderSnapshotApplication, IScopeDependency

src/Hotline.Application/Snapshot/SnapshotThirdAccountSupplier.cs

@@ -7,7 +7,7 @@ using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Enums.User;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using IdentityModel;

src/Hotline.Application/Snapshot/ZiGongSnapshotApplication.cs

@@ -8,7 +8,7 @@ using Hotline.Orders;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using System;
 using System.Collections.Generic;

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -248,7 +248,6 @@ namespace Hotline.Application.Subscribers
         [CapSubscribe(Hotline.Share.Mq.EventNames.SharingOrderRevoke)]
         public async Task RecCancelOrderAsync(CancelOrderDto dto, CancellationToken cancellationToken)
         {
-            //  var order = await _orderRepository.GetAsync(p => p.ReceiveProvinceNo == dto.ProvinceNo, cancellationToken);
             var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(p => p.ReceiveProvinceNo == dto.ProvinceNo);
             if (order is null)
                 throw new UserFriendlyException("未查询到工单");

src/Hotline.Repository.SqlSugar/Snapshot/CommunityInfoRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/IndustryCaseRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/IndustryLogRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/IndustryRepository.cs

@@ -1,7 +1,7 @@
 using Hotline.Orders;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/InviteCodeRecordRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/InviteCodeRepository.cs

@@ -1,5 +1,4 @@
-using Hotline.Snapshot.Interfaces;
-using Hotline.Snapshot;
+using Hotline.Snapshot;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +7,7 @@ using System.Threading.Tasks;
 using XF.Domain.Dependency;
 using SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Repository.SqlSugar.Snapshot;
 public class InviteCodeRepository : BaseRepository<InviteCode>, IInviteCodeRepository, IScopeDependency

src/Hotline.Repository.SqlSugar/Snapshot/OrderSnapshotRepository.cs

@@ -2,7 +2,7 @@
 using Hotline.Share.Dtos;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Microsoft.AspNetCore.Http;
 using SqlSugar;
 using System;

src/Hotline.Repository.SqlSugar/Snapshot/PractitionerRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/RedPackAuditRepository.cs

@@ -1,7 +1,7 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/RedPackGuiderAuditRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/RedPackRecordRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/SnapshotBulletinRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/SnapshotLabelLogRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/SnapshotOrderPublishRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/SnapshotPointsRecordRepository.cs

@@ -0,0 +1,19 @@
+using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Snapshot;
+using Hotline.Snapshot.IRepository;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Dependency;
+
+namespace Hotline.Repository.SqlSugar.Snapshot;
+
+public class SnapshotPointsRecordRepository : BaseRepository<SnapshotPointsRecord>, ISnapshotPointsRecordRepository, IScopeDependency
+{
+    public SnapshotPointsRecordRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder, IServiceProvider serviceProvider) : base(uow, dataPermissionFilterBuilder, serviceProvider)
+    {
+    }
+}

src/Hotline.Repository.SqlSugar/Snapshot/SnapshotSMSTemplateRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/SpecialRedPackAuditRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using MediatR;
 using SqlSugar;
 using System;

src/Hotline.Repository.SqlSugar/Snapshot/SupplementRecordRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/VolunteerReportRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Repository.SqlSugar/Snapshot/VolunteerRepository.cs

@@ -2,7 +2,7 @@
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;

src/Hotline.Share/Dtos/Snapshot/IndustryFileDto.cs

@@ -57,7 +57,7 @@ public class SnapshotFileInDto
     /// 上传接口返回数据中的Id字段
     /// 附件系统中附件的Id
     /// </summary>
-    public string AdditionId { get; set; }
+    public string Id { get; set; }
 
     /// <summary>
     /// 时长(秒)

src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

@@ -804,6 +804,27 @@ public class SnapshotOrderAuditDetailOutDto
     /// 审核状态
     /// </summary>
     public IEnumerable<KeyValuePair<int, string>> AuditComBox { get; set; }
+
+    /// <summary>
+    /// 额外扣除积分类型
+    /// </summary>
+    public IReadOnlyCollection<SystemDicDataOutDto> ExtraDeductionPointsType { get; set; }
+
+    /// <summary>
+    /// 审核同意积分
+    /// </summary>
+    public int? ArgeePoints { get; set; }
+
+    /// <summary>
+    /// 审核不同意扣除积分
+    /// </summary>
+    public int? RefusePoints { get; set; }
+
+    /// <summary>
+    /// 额外扣除积分
+    /// </summary>
+    public int? ExtraDeductedPoints { get; set; }
+
 }
 
 public class SnapshotOrderAuditOrderDetailOutDto
@@ -998,6 +1019,28 @@ public class UpdateRedPackAuditInDto
     /// 是否发送短信
     /// </summary>
     public bool IsSendSms { get; set; }
+
+    /// <summary>
+    /// 积分审核状态
+    /// </summary>
+    public ESnapshotSMSStatus PointsStatus { get; set; }
+
+    /// <summary>
+    /// 积分
+    /// </summary>
+    public int? Points { get; set; }
+
+    /// <summary>
+    /// 额外扣除积分类型
+    /// </summary>
+    public string? ExtraDeductionPointsTypeId { get; set; }
+
+    public string? ExtraDeductionPointsTypeName { get; set; }
+
+    /// <summary>
+    /// 额外扣除积分
+    /// </summary>
+    public int? ExtraDeductedPoints { get; set; }
 }
 
 public class GetRedPackRecordBaseDataOutDto

src/Hotline.Share/Enums/CallCenter/ECallDirection.cs

@@ -18,4 +18,19 @@ public enum ECallDirection
     /// </summary>
     [Description("呼出")]
     Out = 1,
+}
+
+public enum EPointsDirection
+{ 
+    /// <summary>
+    /// 收入
+    /// </summary>
+    [Description("收入")]
+    In = 0,
+
+    /// <summary>
+    /// 支出
+    /// </summary>
+    [Description("支出")]
+    Out = 1
 }

src/Hotline.Share/Enums/Snapshot/EPointsSource.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Enums.Snapshot;
+
+public enum EPointsSource
+{
+    /// <summary>
+    /// 上报积分
+    /// </summary>
+    [Description("上报积分")]
+    Report = 0,
+
+    /// <summary>
+    /// 审核积分
+    /// </summary>
+    [Description("审核积分")]
+    Audit = 1
+}

src/Hotline/Caching/Interfaces/ISysDicDataCacheManager.cs

@@ -89,5 +89,10 @@ namespace Hotline.Caching.Interfaces
         /// 随手拍特殊红包审核类型
         /// </summary>
         IReadOnlyCollection<SystemDicDataOutDto> SnapshotRedPackSpecialType { get; }
+
+        /// <summary>
+        /// 额外扣除积分类型
+        /// </summary>
+        IReadOnlyCollection<SystemDicDataOutDto> ExtraDeductionPointsType { get; }
     }
 }

src/Hotline/Caching/Services/SysDicDataCacheManager.cs

@@ -145,6 +145,11 @@ namespace Hotline.Caching.Services
         /// </summary>
         public IReadOnlyCollection<SystemDicDataOutDto> SnapshotRedPackSpecialType => GetOrAdd(SysDicTypeConsts.SnapshotRedPackSpecialType);
 
+        /// <summary>
+        /// 额外扣除积分类型
+        /// </summary>
+        public IReadOnlyCollection<SystemDicDataOutDto> ExtraDeductionPointsType => GetOrAdd(SysDicTypeConsts.ExtraDeductionPointsType);
+
         /// <summary>
         /// 兴唐动作状态映射
         /// </summary>

src/Hotline/Orders/DatabaseEventHandler/OrderSnapshotEventHandler.cs

@@ -1,5 +1,5 @@
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Hotline/Orders/OrderDomainService.cs

@@ -38,9 +38,9 @@ using Hotline.Share.Mq;
 using System.Security.Cryptography;
 using Hotline.FlowEngine.Definitions;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Share.Enums.Settings;
 using Hotline.Settings.TimeLimitDomain;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Orders;
 
@@ -609,13 +609,13 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
     /// <returns></returns>
     public async Task LogAverageOrder(string userId, Scheduling scheduling, CancellationToken cancellationToken)
     {
-        //1.获取默认派单员所属的工单
-        //2.获取今天上班的人员
-        //3.给当前这个用户平均派单
+		//1.获取默认派单员所属的工单
+		//2.获取今天上班的人员
+		//3.给当前这个用户平均派单
 
-        var steps = await _workflowDomainService.GetStepsBelongsToAsync(AppDefaults.SendPoolId,
-            cancellationToken);
-        var roleId = _systemSettingCacheManager.GetSetting(SettingConstants.RolePaiDan)?.SettingValue[0];
+		var steps = await _workflowDomainService.GetStepsBelongsToAsync(AppDefaults.SendPoolId,
+		   cancellationToken);
+		var roleId = _systemSettingCacheManager.GetSetting(SettingConstants.RolePaiDan)?.SettingValue[0];
 
         var user = await _userRepository.Queryable()
             .Includes(d => d.Organization)
@@ -653,7 +653,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
             }, cancellationToken);
         }
 
-    }
+	}
 
     /// <summary>
     /// 触发平均派单

src/Hotline/SeedData/SystemDicDataSeedData.cs

@@ -175,6 +175,14 @@ public class SystemDicDataSeedData : ISeedData<SystemDicData>
                 new() { Id = "08dd6a95-9d0d-4ffd-82f6-0037ced40215", DicDataValue = "SSPBanner", DicDataName = "随手拍Banner", Sort = 18 },
                 ];
         }
+        if (dicTypeCode == SysDicTypeConsts.ExtraDeductionPointsType)
+        {
+            return [
+                new() { Id = "08dd6061-ec08-48ba-8768-fa962a107b6c", DicDataValue = "xjjb", DicDataName = "虚假举报", Sort = 1},
+                new() { Id = "08dd6060-a4e4-498f-8a38-a512e57d591e", DicDataValue = "eysjf", DicDataName = "恶意刷积分", Sort = 2},
+                new() { Id = "08dd6061-faed-413f-8c87-c24b59e86496", DicDataValue = "qt", DicDataName = "其他", Sort = 3},
+                ];
+        }
 
         throw new NotImplementedException();
     }
@@ -182,6 +190,10 @@ public class SystemDicDataSeedData : ISeedData<SystemDicData>
     public SystemDicType GetType(string dicTypeCode)
     {
         var dicType = new string[2];
+        if (dicTypeCode == SysDicTypeConsts.ExtraDeductionPointsType)
+        { 
+            dicType = ["08dd6aae-e949-401d-8e44-2baf4b59fcf4", "额外扣除积分类型"];
+        }
         if (dicTypeCode == SysDicTypeConsts.SnapshotOrderLabel)
         {
             dicType = ["08dd1fdb-4c32-4464-83a4-b61afa1e624a", "随手拍工单标签"];

src/Hotline/Settings/SysDicTypeConsts.cs

@@ -317,6 +317,21 @@ public class SysDicTypeConsts
     /// </summary>
     public static string SnapshotRedPackSpecialType = "SnapshotRedPackSpecialType";
 
+    /// <summary>
+    /// 预警级别
+    /// </summary>
+    public static string EarlyWarningLevel = "EarlyWarningLevel";
+
+    /// <summary>
+    /// 预警类型
+    /// </summary>
+    public static string EarlyWarningType = "EarlyWarningType";
+
+    /// <summary>
+    /// 额外扣除积分类型
+    /// </summary>
+    public static string ExtraDeductionPointsType = "ExtraDeductionPointsType";
+
     /// <summary>
     /// 政治身份
     /// </summary>

src/Hotline/Snapshot/Contracts/ISnapshotPointsDomainService.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Snapshot.Contracts;
+
+/// <summary>
+/// 随手拍积分领域服务
+/// </summary>
+public interface ISnapshotPointsDomainService
+{
+}

src/Hotline/Snapshot/Interfaces/ICommunityInfoRepository.cs → src/Hotline/Snapshot/IRepository/ICommunityInfoRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ICommunityInfoRepository : IRepository<CommunityInfo>
 {
 }

src/Hotline/Snapshot/Interfaces/IGuiderSystemService.cs → src/Hotline/Snapshot/IRepository/IGuiderSystemService.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 
 /// <summary>
 /// 网格员系统服务

src/Hotline/Snapshot/Interfaces/IIndustryCaseRepository.cs → src/Hotline/Snapshot/IRepository/IIndustryCaseRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IIndustryCaseRepository : IRepository<IndustryCase>
 {
 }

src/Hotline/Snapshot/Interfaces/IIndustryRepository.cs → src/Hotline/Snapshot/IRepository/IIndustryRepository.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IIndustryRepository : IRepository<Industry>
 {
     Task<IList<dynamic>> GetDataBaseAsync();

src/Hotline/Snapshot/Interfaces/IInviteCodeRepository.cs → src/Hotline/Snapshot/IRepository/IInviteCodeRepository.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IInviteCodeRepository : IRepository<InviteCode>
 {
 }

src/Hotline/Snapshot/Interfaces/IOrderSnapshotRepository.cs → src/Hotline/Snapshot/IRepository/IOrderSnapshotRepository.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IOrderSnapshotRepository : IRepository<OrderSnapshot>
 {
     /// <summary>

src/Hotline/Snapshot/Interfaces/IPractitionerRepository.cs → src/Hotline/Snapshot/IRepository/IPractitionerRepository.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IPractitionerRepository : IRepository<Practitioner>
 {
 }

src/Hotline/Snapshot/Interfaces/IRedPackAuditRepository.cs → src/Hotline/Snapshot/IRepository/IRedPackAuditRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IRedPackAuditRepository : IRepository<RedPackAudit>
 {
     /// <summary>

src/Hotline/Snapshot/Interfaces/IRedPackGuiderAuditRepository.cs → src/Hotline/Snapshot/IRepository/IRedPackGuiderAuditRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IRedPackGuiderAuditRepository : IRepository<RedPackGuiderAudit>
 {
 }

src/Hotline/Snapshot/Interfaces/IRedPackRecordRepository.cs → src/Hotline/Snapshot/IRepository/IRedPackRecordRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IRedPackRecordRepository : IRepository<RedPackRecord>
 {
 }

src/Hotline/Snapshot/Interfaces/ISnapshotBulletinRepository.cs → src/Hotline/Snapshot/IRepository/ISnapshotBulletinRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ISnapshotBulletinRepository : IRepository<SnapshotBulletin>
 {
 }

src/Hotline/Snapshot/Interfaces/ISnapshotLabelLogRepository.cs → src/Hotline/Snapshot/IRepository/ISnapshotLabelLogRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ISnapshotLabelLogRepository : IRepository<SnapshotLabelLog>
 {
 }

src/Hotline/Snapshot/Interfaces/ISnapshotOrderPublishRepository.cs → src/Hotline/Snapshot/IRepository/ISnapshotOrderPublishRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ISnapshotOrderPublishRepository : IRepository<SnapshotOrderPublish>
 {
 }

src/Hotline/Snapshot/IRepository/ISnapshotPointsRecordRepository.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Repository;
+
+namespace Hotline.Snapshot.IRepository;
+
+public interface ISnapshotPointsRecordRepository: IRepository<SnapshotPointsRecord>
+{
+}

src/Hotline/Snapshot/Interfaces/ISnapshotSMSTemplateRepository.cs → src/Hotline/Snapshot/IRepository/ISnapshotSMSTemplateRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ISnapshotSMSTemplateRepository : IRepository<SnapshotSMSTemplate>
 {
 }

src/Hotline/Snapshot/Interfaces/ISpecialRedPackAuditRepository.cs → src/Hotline/Snapshot/IRepository/ISpecialRedPackAuditRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ISpecialRedPackAuditRepository : IRepository<SpecialRedPackAudit>
 {
     bool ExistByOrderId(string orderId);

src/Hotline/Snapshot/Interfaces/ISupplementRecordRepository.cs → src/Hotline/Snapshot/IRepository/ISupplementRecordRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface ISupplementRecordRepository : IRepository<SupplementRecord>
 {
 }

src/Hotline/Snapshot/Interfaces/IVolunteerReportRepository.cs → src/Hotline/Snapshot/IRepository/IVolunteerReportRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IVolunteerReportRepository : IRepository<VolunteerReport>
 {
 }

src/Hotline/Snapshot/Interfaces/IVolunteerRepository.cs → src/Hotline/Snapshot/IRepository/IVolunteerRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IVolunteerRepository : IRepository<Volunteer>
 {
     /// <summary>

src/Hotline/Snapshot/Interfaces/IndustryLogRepository.cs → src/Hotline/Snapshot/IRepository/IndustryLogRepository.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IIndustryLogRepository : IRepository<IndustryLog>
 {
 }

src/Hotline/Snapshot/Interfaces/InviteCodeRecord.cs → src/Hotline/Snapshot/IRepository/InviteCodeRecord.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
-namespace Hotline.Snapshot.Interfaces;
+namespace Hotline.Snapshot.IRepository;
 public interface IInviteCodeRecordRepository : IRepository<InviteCodeRecord>
 {
 }

src/Hotline/Snapshot/Industry.cs

@@ -172,4 +172,28 @@ public class Industry : CreationSoftDeleteEntity
     /// </summary>
     [SugarColumn(ColumnDescription = "行业类型")]
     public EIndustryType IndustryType { get; set; }
+
+    /// <summary>
+    /// 上报积分
+    /// </summary>
+    [SugarColumn(ColumnDescription = "上报积分")]
+    public int? ReportPoints { get; set; }
+
+    /// <summary>
+    /// 审核同意积分
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审核同意积分")]
+    public int? ArgeePoints { get; set; }
+
+    /// <summary>
+    /// 审核不同意扣除积分
+    /// </summary>
+    [SugarColumn(ColumnDescription = "审核不同意扣除积分")]
+    public int? RefusePoints { get; set; }
+
+    /// <summary>
+    /// 额外扣除积分
+    /// </summary>
+    [SugarColumn(ColumnDescription = "额外扣除积分")]
+    public int? ExtraDeductedPoints { get; set; }
 }

src/Hotline/Snapshot/Notifications/PostGuiderSystemNotification.cs

@@ -4,7 +4,7 @@ using Hotline.Orders;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.Contracts;
 using MediatR;
 using System;
 using System.Collections.Generic;

src/Hotline/Snapshot/Services/SnapshotPointsDomainService.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Snapshot.Services;
+
+public class SnapshotPointsDomainService
+{
+}

src/Hotline/Snapshot/SnapshotPointsRecord.cs

@@ -0,0 +1,33 @@
+using Hotline.Share.Enums.CallCenter;
+using Hotline.Share.Enums.Snapshot;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Repository;
+
+namespace Hotline.Snapshot;
+
+/// <summary>
+/// 积分记录
+/// </summary>
+[Description("积分记录")]
+public class SnapshotPointsRecord : CreationEntity
+{
+    /// <summary>
+    /// 方向
+    /// </summary>
+    public EPointsDirection direction { get; set; }
+
+    /// <summary>
+    /// 积分来源
+    /// </summary>
+    public EPointsSource Source { get; set; }
+
+    /// <summary>
+    /// 积分
+    /// </summary>
+    public int Points { get; set; }
+}

src/TianQue.Sdk/TiqnQueService.cs

@@ -4,7 +4,7 @@ using Hotline.Orders;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tools;
 using Mapster;
 using Microsoft.Extensions.Logging;

test/Hotline.Tests/Application/IndustryApplicationTest.cs

@@ -6,7 +6,6 @@ using Hotline.Identity.Roles;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Users;
 using Mapster;
 using Microsoft.AspNetCore.Http;
@@ -18,6 +17,7 @@ using XF.Domain.Cache;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.Repository.SqlSugar.Extensions;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Tests.Application;
 public class IndustryApplicationTest : TestBase

test/Hotline.Tests/Application/InviteCodeApplicationTest.cs

@@ -6,7 +6,7 @@ using Hotline.Orders;
 using Hotline.Repository.SqlSugar.Snapshot;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Hotline.Users;

test/Hotline.Tests/Application/OrderSnapshotApplicationTest.cs

@@ -12,7 +12,7 @@ using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Requests;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tests.Mock;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;

test/Hotline.Tests/Application/RedPackApplicationTest.cs

@@ -8,7 +8,7 @@ using Hotline.Settings;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Enums.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tests.Mock;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;

test/Hotline.Tests/Application/SnapshotApplicationTest.cs

@@ -18,7 +18,7 @@ using Hotline.Share.Enums.ThirdAccount;
 using Hotline.Share.Enums.User;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tests.Mock;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;

test/Hotline.Tests/Controller/OrderControllerTest.cs

@@ -19,7 +19,6 @@ using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Tests.Dto;
 using Hotline.Tests.Mock;
 using Hotline.Tests.SqlSuger;
@@ -44,6 +43,7 @@ using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Hotline.ThirdAccountDomainServices;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Tests.Controller;
 

test/Hotline.Tests/Controller/SnapshotControllerTest.cs

@@ -9,7 +9,7 @@ using Hotline.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Hotline.Users;

test/Hotline.Tests/Mock/OrderServiceMock.cs

@@ -97,7 +97,7 @@ public class OrderServiceMock
             var result = UploadImage().Result;
             item.FileName = result.FileName;
             item.Path = result.Path;
-            item.AdditionId = result.Id;
+            item.Id = result.Id;
         }
         CreateOrderOutDto = _snapshotController.AddOrderAsync(inDto).GetAwaiter().GetResult().ToJson().FromJson<CreateOrderOutDto>();
         _orderServiceStartWorkflow.orderServiceMock = this;

test/Hotline.Tests/Startup.cs

@@ -25,7 +25,6 @@ using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Repository.SqlSugar.Ts;
 using Hotline.Settings.TimeLimitDomain;
 using Hotline.Settings.TimeLimitDomain.ExpireTimeSupplier;
-using Hotline.Snapshot.Interfaces;
 using Hotline.Tests.Mock;
 using Hotline.Tests.Mock.Interfaces;
 using Hotline.Tests.SqlSuger;
@@ -53,6 +52,7 @@ using XF.Utility.MQ;
 using Xunit.DependencyInjection.AspNetCoreTesting;
 using Hotline.Pdf;
 using Hotline.ThirdAccountDomainServices.Interfaces;
+using Hotline.Snapshot.IRepository;
 
 namespace Hotline.Tests;
 public class Startup

test/Hotline.Tests/TestBase.cs

@@ -9,7 +9,7 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.ThirdAccount;
 using Hotline.Share.Enums.User;
 using Hotline.Share.Tools;
-using Hotline.Snapshot.Interfaces;
+using Hotline.Snapshot.IRepository;
 using Hotline.Tests.Infrastructure;
 using Hotline.ThirdAccountDomainServices;
 using Hotline.ThirdAccountDomainServices.Interfaces;