From 17a3a8a36d5bc931b32a70a5c9b9d2fa5f5f3150 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Fri, 13 Sep 2024 16:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/TrackPush/EditTrackPushConfigInput.cs    |  9 ++-------
 .../TrackPushAggregate/TrackPushConfigEntity.cs   |  4 ++--
 .../TrackPush/GetTrackPushConfigDetailOutputVO.cs | 11 +++--------
 .../TrackTemplate/GetTrackTemplateDetailVO.cs     | 11 ++++++++---
 .../Repositories/TrackPushConfigRepository.cs     | 15 ++++++---------
 .../Repositories/TrackTemplateRepository.cs       |  4 +++-
 6 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
index e9dc1d9a..517ee3d8 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
@@ -22,14 +22,9 @@ public class EditTrackPushConfigInput
     public OptionTypeNoNull Options { get; set; }
 
     /// <summary>
-    /// 推送轨迹订单号
+    /// 服务商code
     /// </summary>
-    public string? OrderNoName { get; set; }
-
-    /// <summary>
-    /// 服务商id
-    /// </summary>
-    public int? ServiceProviderId { get; set; }
+    public string ServiceProviderCode { get; set; }
 
     /// <summary>
     /// 子系统id
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs
index cd6a9e1c..b5215d63 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushConfigEntity.cs
@@ -29,8 +29,8 @@ public class TrackPushConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot
     /// <summary>
     /// 服务商id（客户:服务商 1:1）
     /// </summary>
-    [SugarColumn(ColumnName = "ServiceProviderId")]
-    public int ServiceProviderId { get; set; }
+    [SugarColumn(ColumnName = "ServiceProviderCode")]
+    public string ServiceProviderCode { get; set; }
 
     /// <summary>
     /// 子系统id
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
index 431af295..25376a00 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
@@ -1,4 +1,4 @@
-using SJZY.Track.Share.Enums;
+using SJZY.Track.Share.Enums;
 
 namespace SJZY.Track.Domain.Dtos.TrackPush;
 
@@ -22,14 +22,9 @@ public class GetTrackPushConfigDetailOutputVO
     public bool IsAutoPush { get; set; }
 
     /// <summary>
-    /// 服务商
+    /// 服务商code
     /// </summary>
-    public string ServiceProvider { get; set; }
-
-    /// <summary>
-    /// 服务商id
-    /// </summary>
-    public int ServiceProviderId { get; set; }
+    public string ServiceProviderCode { get; set; }
 
     /// <summary>
     /// 子系统
diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs
index a95c017a..1fa2b4a0 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs
@@ -1,4 +1,4 @@
-namespace SJZY.Track.Domain.Dtos.TrackTemplate;
+namespace SJZY.Track.Domain.Dtos.TrackTemplate;
 
 /// <summary>
 /// 获取轨迹模版明细
@@ -31,9 +31,14 @@ public class GetTrackTemplateDetailVO
     public string Code { get; set; }
 
     /// <summary>
-    /// 显示原轨迹
+    /// 分类id
     /// </summary>
-    public bool ShowOrigin { get; set; }
+    public int CategoryId { get; set; }
+
+    /// <summary>
+    /// 客户id
+    /// </summary>
+    public int CustomerId { get; set; }
 }
 
 /// <summary>
diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
index 75a3fe8b..e7443fb1 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
@@ -63,17 +63,15 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
             .LeftJoin<VSystemEntity>((trackPush, system) => trackPush.SubSystemId == system.Id && !system.IsDeleted)
             .LeftJoin<VExternalSubjectEntity>((trackPush, system, externalSubject) =>
                 trackPush.CustomId == externalSubject.Id && !externalSubject.IsDeleted)
-            .LeftJoin<VServiceProviderEntity>((trackPush, system, externalSubject, service) =>
-                trackPush.ServiceProviderId == service.Id && !service.IsDeleted)
             .Filter(null, true)
             .Where(trackPush => trackPush.Id == id && !trackPush.IsDeleted)
             .Select(
-                (trackPush, system, externalSubject, service) => new GetTrackPushConfigDetailOutputVO
+                (trackPush, system, externalSubject) => new GetTrackPushConfigDetailOutputVO
                 {
                     Id = trackPush.Id,
                     SubSystem = system.CnName,
                     CustomName = externalSubject.Abbreviation,
-                    ServiceProvider = service.Name,
+                    ServiceProviderCode = trackPush.ServiceProviderCode,
                     DateTimeFormat = trackPush.DateTimeFormat,
                     DateTimeFormatType =
                         trackPush.DateTimeFormatType == DateTimeFormatEnum.None
@@ -127,17 +125,16 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
     {
         return await Context.Queryable<TrackPushConfigEntity>()
             .LeftJoin<TrackPushContentConfigEntity>((a, b) => a.Id == b.TrackPushConfigId)
-            .LeftJoin<VServiceProviderEntity>((a, b, c) => a.ServiceProviderId == c.Id)
-            .LeftJoin<TrackContentEntity>((a, b, c, d) => b.TrackContentId == d.Id)
-            .LeftJoin<TrackContentEntity>((a, b, c, d, e) => b.SwapTrackContentId == e.Id)
+            .LeftJoin<TrackContentEntity>((a, b, d) => b.TrackContentId == d.Id)
+            .LeftJoin<TrackContentEntity>((a, b, d, e) => b.SwapTrackContentId == e.Id)
             .Where(a => a.Id == configId)
             .OrderBy((a, b) => b.Sort)
-            .Select((a, b, c, d, e) => new TrackPushContentConfigVO
+            .Select((a, b, d, e) => new TrackPushContentConfigVO
             {
                 IsAutoPush = a.IsAutoPush,
                 IsCanUpdate = a.IsCanUpdate,
                 IsAllPush = a.IsAllPush,
-                ServiceProviderCode = c.Code,
+                ServiceProviderCode = a.ServiceProviderCode,
                 OrderType = b.OrderNoType,
                 TrackCode = d.Code,
                 SwapTrackCode = e.Code,
diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
index 91b54841..d322d4cc 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
@@ -28,7 +28,9 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
                 Code = a.Code,
                 Name = a.Name,
                 SubSystemId = a.SubSystemId,
-                SubSystem = b.CnName
+                SubSystem = b.CnName,
+                CustomerId = a.CustomerId,
+                CategoryId = a.CategoryId,
             }).FirstAsync();
 
         return detail;