diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
new file mode 100644
index 00000000..cf3cb8ee
--- /dev/null
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
@@ -0,0 +1,81 @@
+namespace SJZY.Track.Application.Contract.Dtos.TrackPush;
+
+public class EditTrackPushConfigInput
+{
+    /// <summary>
+    /// 客户id
+    /// </summary>
+    public int CustomId { get; set; }
+
+    /// <summary>
+    /// 推送扩展字段
+    /// </summary>
+    public string ExpandFieldsName { get; set; }
+
+    public int? Id { get; set; }
+
+    /// <summary>
+    /// 是否自动推送
+    /// </summary>
+    public bool IsAutoPush { get; set; }
+
+    /// <summary>
+    /// 操作类型
+    /// </summary>
+    public OptionTypeNoNull Options { get; set; }
+
+    /// <summary>
+    /// 推送轨迹订单号
+    /// </summary>
+    public string OrderNoName { get; set; }
+
+    /// <summary>
+    /// 服务商id
+    /// </summary>
+    public int ServiceProviderId { get; set; }
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 推送轨迹时区
+    /// </summary>
+    public string TackTimeZoneName { get; set; }
+
+    /// <summary>
+    /// 推送轨迹内容代码
+    /// </summary>
+    public string TrackContentCodeName { get; set; }
+
+    /// <summary>
+    /// 推送轨迹内容
+    /// </summary>
+    public string TrackContentName { get; set; }
+
+    /// <summary>
+    /// 推送轨迹内容英文
+    /// </summary>
+    public string TrackEnContentName { get; set; }
+
+    /// <summary>
+    /// 推送轨迹发生地
+    /// </summary>
+    public string TrackPlaceName { get; set; }
+
+    /// <summary>
+    /// 推送轨迹状态
+    /// </summary>
+    public string TrackStatusName { get; set; }
+
+    /// <summary>
+    /// 轨迹模板id
+    /// </summary>
+    public List<int> TrackTemplateIds { get; set; }
+
+    /// <summary>
+    /// 推送轨迹发生时间
+    /// </summary>
+    public string TrackTimeName { get; set; }
+}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
index a7a570d0..de5d1421 100644
--- a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
+++ b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<Import Project="../../common.props"/>
+	<Import Project="../../common.props" />
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<Version>0.0.2</Version>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="SJZY.Expand.ABP.Common" Version="7.0.11"/>
-		<PackageReference Include="Volo.Abp.Core" Version="7.0.2"/>
+		<PackageReference Include="SJZY.Expand.ABP.Common" Version="7.0.11" />
+		<PackageReference Include="Volo.Abp.Core" Version="7.0.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs
index 420b0e23..351f5321 100644
--- a/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs
+++ b/src/SJZY.Track.Application/AutoMapper/TrackPushAutoMapperProfile.cs
@@ -1,4 +1,8 @@
 using AutoMapper;
+using SJZY.Track.Application.Contract.Dtos.TrackPush;
+using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
+using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
+using Volo.Abp.AutoMapper;
 
 namespace SJZY.Track.Application.AutoMapper;
 
@@ -6,5 +10,9 @@ public class TrackPushAutoMapperProfile : Profile
 {
     public TrackPushAutoMapperProfile()
     {
+        CreateMap<EditTrackPushConfigInput, TrackPushConfigEntity>(MemberList.None)
+            .ForMember(dest => dest.TrackTemplateId, opt => opt.MapFrom(source => string.Join(',', source.TrackTemplateIds)));
+        CreateMap<EditTrackPushConfigInput, TrackPushPullParamsConfigEntity>(MemberList.None).Ignore(dest => dest.Id)
+            .ForMember(dest => dest.IsPush, opt => opt.MapFrom(source => true));
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs
index a862e224..cd4567f6 100644
--- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushService.cs
@@ -1,8 +1,15 @@
 using Microsoft.Extensions.Localization;
+using SJZY.Expand.ABP.Core.Localization;
+using SJZY.Expand.ABP.Core.PublicMethords;
+using SJZY.Track.Application.Contract.Dtos.TrackPush;
 using SJZY.Track.Application.Localization;
+using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
+using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.Common;
 using SJZY.Track.Domain.Dtos.TrackPush;
+using SqlSugar;
+using System.Linq.Expressions;
 using Volo.Abp.DependencyInjection;
 
 namespace SJZY.Track.Application.Services.TrackPush;
@@ -16,13 +23,19 @@ public class TrackPushService : ApplicationService, ITransientDependency
 {
     private readonly IStringLocalizer<TrackLocalizationResource> _stringLocalizer;
     private readonly ITrackPushConfigRepository _trackPushConfigRepository;
+    private readonly ITrackTemplateRepository _trackTemplateRepository;
+    private readonly ITrackPullConfigRepository _trackPullConfigRepository;
 
     public TrackPushService(
         IStringLocalizer<TrackLocalizationResource> stringLocalizer,
-        ITrackPushConfigRepository trackPushConfigRepository)
+        ITrackPushConfigRepository trackPushConfigRepository,
+        ITrackTemplateRepository trackTemplateRepository,
+        ITrackPullConfigRepository trackPullConfigRepository)
     {
         _stringLocalizer = stringLocalizer;
         _trackPushConfigRepository = trackPushConfigRepository;
+        _trackTemplateRepository = trackTemplateRepository;
+        _trackPullConfigRepository = trackPullConfigRepository;
     }
 
     /// <summary>
@@ -53,9 +66,18 @@ public class TrackPushService : ApplicationService, ITransientDependency
     /// <param name="id"></param>
     /// <returns></returns>
     [HttpGet("GetDetail")]
-    public async Task<GetTrackPushConfigDetailOutputVO> GetDetailAsync(int id)
+    public async Task<GetTrackPushConfigDetailOutputVO?> GetDetailAsync(int id)
     {
-        return await _trackPushConfigRepository.GetDetailAsync(id);
+        var res = await _trackPushConfigRepository.GetDetailAsync(id);
+        if (res is null) return null;
+
+        List<int> trackTemplateIds = res.TrackTemplateId.Split(',').Select(int.Parse).ToList();
+
+        var trackTemplateEntities = await _trackTemplateRepository.GetListAsync(x => trackTemplateIds.Contains(x.Id));
+
+        trackTemplateEntities.ForEach(item => { (res.TrackTemplate ??= new()).Add(new() { Value = item.Id, Key = item.Name }); });
+
+        return res;
     }
 
     /// <summary>
@@ -68,4 +90,86 @@ public class TrackPushService : ApplicationService, ITransientDependency
     {
         return await _trackPushConfigRepository.GetContentDetailAsync(id);
     }
+
+    /// <summary>
+    /// 轨迹推送配置编辑
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("Edit")]
+    public async Task<bool> EditAsync([FromBody] EditTrackPushConfigInput input)
+    {
+        if (input.Options != OptionTypeNoNull.删除)
+        {
+            Expression<Func<TrackPushConfigEntity, bool>> isAnyExp = x =>
+                x.SubSystemId == input.SubSystemId && x.CustomId == input.CustomId && x.ServiceProviderId == input.ServiceProviderId;
+            if (input.Options == OptionTypeNoNull.修改) isAnyExp.And(x => x.Id != input.Id);
+
+            var trackTemplateIdExp = Expressionable.Create<TrackPushConfigEntity>();
+            foreach (var trackTemplateId in input.TrackTemplateIds) { trackTemplateIdExp.Or(x => SqlFunc.SplitIn(x.TrackTemplateId, trackTemplateId.ToString())); }
+
+            if (await _trackPushConfigRepository.IsAnyAsync(isAnyExp.And(trackTemplateIdExp.ToExpression())))
+                throw new BusinessException(message: _stringLocalizer["IsTrackPushConfigAny"]);
+        }
+
+        switch (input.Options)
+        {
+            case OptionTypeNoNull.新增:
+                {
+                    var trackPushEntity = ObjectMapper.Map<EditTrackPushConfigInput, TrackPushConfigEntity>(input);
+                    var trackPushParamsEntity = ObjectMapper.Map<EditTrackPushConfigInput, TrackPushPullParamsConfigEntity>(input);
+
+                    using (var ts = TransactionScopeHelper.Create())
+                    {
+                        int id = await _trackPushConfigRepository.InsertReturnIdentityAsync(trackPushEntity);
+
+                        trackPushParamsEntity.PullOrPushConfigId = id;
+                        await _trackPullConfigRepository.InsertParamsAsync(trackPushParamsEntity);
+
+                        ts.Complete();
+                    }
+                }
+                break;
+
+            case OptionTypeNoNull.修改:
+                {
+                    var oldTrackPushEntity = await _trackPushConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]);
+
+                    var oldTrackPushParamsEntity =
+                        await _trackPullConfigRepository.GetParamsSingleAsync(x =>
+                            x.PullOrPushConfigId == input.Id && x.IsPush);
+
+                    ObjectMapper.Map(input, oldTrackPushEntity);
+                    ObjectMapper.Map(input, oldTrackPushParamsEntity);
+
+                    using (var ts = TransactionScopeHelper.Create())
+                    {
+                        await _trackPushConfigRepository.UpdateAsync(oldTrackPushEntity);
+                        await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPushParamsEntity);
+
+                        ts.Complete();
+                    }
+                }
+                break;
+
+            case OptionTypeNoNull.删除:
+                using (var ts = TransactionScopeHelper.Create())
+                {
+                    await _trackPushConfigRepository.SoftDeleteAsync(x => x.Id == input.Id);
+                    await _trackPullConfigRepository.SoftDeleteParamsAsync(x =>
+                        x.PullOrPushConfigId == input.Id && x.IsPush);
+                    await _trackPushConfigRepository.SoftDeleteContentAsync(x => x.TrackPushConfigId == input.Id);
+
+                    ts.Complete();
+                }
+
+                break;
+
+            default:
+                throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum,
+                    nameof(EditTrackPushConfigInput.Options)]);
+        }
+
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs
index 39b19ad2..9c82ef1c 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushConfigRepository.cs
@@ -12,4 +12,6 @@ public interface ITrackPushConfigRepository : IBasicRepository<TrackPushConfigEn
     Task<GetTrackPushConfigDetailOutputVO> GetDetailAsync(int id);
 
     Task<GetTrackPushContentDetailOutputVO> GetContentDetailAsync(int id);
+
+    Task<bool> SoftDeleteContentAsync(Expression<Func<TrackPushContentConfigEntity, bool>> whereExpression);
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
index 6e9cd961..900c74bc 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
@@ -89,7 +89,7 @@ public class GetTrackPushConfigDetailOutputVO
     /// <summary>
     /// 轨迹模板id
     /// </summary>
-    public int TrackTemplateId { get; set; }
+    public string TrackTemplateId { get; set; }
 
     /// <summary>
     /// 推送轨迹发生时间
diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
index 999a2732..07cbedc7 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
@@ -6,6 +6,7 @@ using SJZY.Track.Domain.Dtos.Common;
 using SJZY.Track.Domain.Dtos.TrackPush;
 using SJZY.Track.Domain.VEntities;
 using SJZY.Track.Repository.VData.Entitys;
+using System.Linq.Expressions;
 
 namespace SJZY.Track.Repository.Repositories;
 
@@ -82,4 +83,12 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
             }, true)
             .SingleAsync();
     }
+
+    public async Task<bool> SoftDeleteContentAsync(Expression<Func<TrackPushContentConfigEntity, bool>> whereExpression)
+    {
+        return await Context.Updateable<TrackPushContentConfigEntity>()
+            .Where(whereExpression)
+            .SetColumns(nameof(ISoftDeleteBasicEntity.IsDeleted), true)
+            .ExecuteCommandHasChangeAsync();
+    }
 }
\ No newline at end of file