From ff14cb5d323be1762d3f390c10b2b274e0d0cf68 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Wed, 6 Mar 2024 20:05:05 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 908d7227..5228df92 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -73,6 +73,11 @@ namespace SJZY.Track.Application.Services.TrackOrders a.IsCanDelete=trackContent.IsCanDelete; a.IsExternal = trackContent.IsExternal; } + else + { + a.IsCanDelete=false; + a.IsExternal=false; + } if (a.TrackTimeZoneValue==0f) { a.TrackTimeZone=$"GTM{" "}+00:00"; From 350ba56a450ecc48165348ab2a9cb83d6507f0ce Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Wed, 6 Mar 2024 20:11:54 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 5228df92..0e08e188 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -73,11 +73,11 @@ namespace SJZY.Track.Application.Services.TrackOrders a.IsCanDelete=trackContent.IsCanDelete; a.IsExternal = trackContent.IsExternal; } - else - { - a.IsCanDelete=false; - a.IsExternal=false; - } + //else + //{ + // a.IsCanDelete=false; + // a.IsExternal=false; + //} if (a.TrackTimeZoneValue==0f) { a.TrackTimeZone=$"GTM{" "}+00:00"; From 7949fd1dfa8a3ef36d515e86036c22fab53942d8 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Tue, 12 Mar 2024 09:43:19 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=20=20=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E5=AE=A2=E6=88=B7=20=E7=9A=84=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProvideServices/GetPageTrackOrderInput.cs | 15 +++++++++++++++ .../Options/GetCamsUrlOptions.cs | 17 +++++++++++++++++ .../Dtos/Order/GetPageTrackOrderInputVO.cs | 15 +++++++++++++++ .../Repositories/OrderRepository.cs | 3 +++ 4 files changed, 50 insertions(+) create mode 100644 src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index 81aa553e..26e2e776 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -17,6 +17,16 @@ public class GetPageTrackOrderInput : PageInfoInput /// public string? OrderNos { get; set; } + /// + /// 订单类型 + /// + public int? TrackOrderType { get; set; } + + /// + /// 客户id + /// + public int? CustomerId { get; set; } + /// /// 创建时间开始 /// @@ -73,6 +83,11 @@ public class TrackOrderDto /// public string? CustomerCode { get; set; } + /// + /// 客户id + /// + public int CustomerId { get; set; } + /// /// 订单明细（json） /// diff --git a/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs new file mode 100644 index 00000000..82677724 --- /dev/null +++ b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs @@ -0,0 +1,17 @@ +using SJZY.Expand.ABP.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SJZY.Track.Application.Options +{ + public class GetCamsUrlOptions : IOptionAutoInjection + { + /// + /// 2.5URL + /// + public string? Cams25URL { get; set; } + } +} diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index c1b97cc5..67d955f9 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -24,6 +24,16 @@ namespace SJZY.Track.Domain.Dtos.Order /// public string? OrderNos { get; set; } + /// + /// 订单类型 + /// + public int? TrackOrderType { get; set; } + + /// + /// 客户id + /// + public int? CustomerId { get; set; } + /// /// 创建时间开始 /// @@ -75,6 +85,11 @@ namespace SJZY.Track.Domain.Dtos.Order /// public string? CustomerCode { get; set; } + /// + /// 客户id + /// + public int CustomerId { get; set; } + ///// ///// 订单明细（json） ///// diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 481a5c87..0348c347 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -137,6 +137,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I (a, b, c) => a.CreateTime >= input.CreateTimeStart) .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue, (a, b, c) => a.CreateTime <= input.CreateTimeEnd) + .WhereIF(input.CustomerId>0, (a, b, c) => a.CustomId==input.CustomerId) + .WhereIF(input.TrackOrderType>0, (a, b, c) => a.OrderType==input.TrackOrderType) .OrderByDescending((a, b, c) => a.CreateTime) .Select((a, b, c) => new TrackOrderVO { @@ -148,6 +150,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I .Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""), CustomerShortName = b.Abbreviation, CustomerCode = b.Code, + CustomerId = a.CustomId, //TrackTemplateNames = SqlFunc.Subqueryable() // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","), From 4e4dbbeb5fe89515321a6728883e9a4564d25283 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Wed, 13 Mar 2024 10:20:26 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/Order/GetPageTrackOrderInputVO.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index fe8e3fb1..c4eacc83 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -39,16 +39,6 @@ namespace SJZY.Track.Domain.Dtos.Order /// public string? OrderNos { get; set; } - /// - /// 订单类型 - /// - public int? TrackOrderType { get; set; } - - /// - /// 客户id - /// - public int? CustomerId { get; set; } - /// /// 创建时间开始 /// From b7c4256e521eaa1484bd15f76bce0cea549d863f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Wed, 20 Mar 2024 15:56:56 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/ProvideServices/GetPageTrackOrderInput.cs | 10 ---------- .../Dtos/Order/GetPageTrackOrderInputVO.cs | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index 07469365..e37b69bd 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -22,16 +22,6 @@ public class GetPageTrackOrderInput : PageInfoInput /// public int TabType { get; set; } - /// - /// 订单类型 - /// - public int? TrackOrderType { get; set; } - - /// - /// 客户id - /// - public int? CustomerId { get; set; } - ///// ///// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4] ///// diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index f742309b..5f164841 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -32,16 +32,6 @@ /// public List? OrderNos { get; set; } - /// - /// 订单类型 - /// - public int? TrackOrderType { get; set; } - - /// - /// 客户id - /// - public int? CustomerId { get; set; } - /// /// 创建时间开始 /// From a02e4ca8b230a37c161201613a466767eb5a97a2 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Fri, 29 Mar 2024 11:17:35 +0800 Subject: [PATCH 06/16] debug --- .../ProvideServices/OrderService.Link.cs | 112 ------------------ .../Services/ProvideServices/OrderService.cs | 101 ++++++++++++++++ 2 files changed, 101 insertions(+), 112 deletions(-) delete mode 100644 src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs deleted file mode 100644 index 88eb9530..00000000 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ /dev/null @@ -1,112 +0,0 @@ -using DotNetCore.CAP; -using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Events; -using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Consts; -using SJZY.Track.Domain.Queries; - -namespace SJZY.Track.Application.Services.ProvideServices; - -/// -/// 订单关联服务 -/// -public partial class OrderService -{ - private readonly IBasicQuery _orderLinkQuery; - private readonly ICapPublisher _capPublisher; - - /// - /// 关联、解除关联订单 - /// - /// - /// - /// - [HttpPost("Order/Link")] - public async Task LinkOrderAsync(LinkOrderInput input) - { - var order = await _orderRepository.GetFirstAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new - { - x.Id, x.SubSystemId - }); - if (order == default) - { - throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); - } - - //tips：循环关联问题再消费时解决 - if (input.OrderType == input.LinkOrderType) - { - throw new BusinessException(message: "不能同级关联"); - } - - if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; - - // 单号去重，去空，去自己 - input.LinkOrderNos = input.LinkOrderNos - .Where(x => !x.IsNullOrWhiteSpace() && x != input.OrderNo) - .Distinct().ToList(); - - // 解绑 - if (!input.IsLink) return await UnLinkOrderAsync(input); - - // 关联订单 - var linkedOrderIds = await DoLinkOrderAsync(input, order.Id); - - // 补轨迹 - if (linkedOrderIds.Count > 0) - { - await _capPublisher.PublishAsync(GlobalConst.OrderLinkAfterFillTrack, new OrderLinkAfterFillTrackEvent - { - OrderId = order.Id, - SubSystemId = order.SubSystemId, - LinkedOrderIds = linkedOrderIds, - }); - } - - return true; - } - - private async Task> DoLinkOrderAsync(LinkOrderInput input, int orderId) - { - // 获取已关联的订单 - var linkOrderNos = await _orderLinkQuery.GetListAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, - x => x.LinkOrderNo); - - // 计算出未关联的订单 - var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); - - // 过滤掉不存在的订单 - var canLinkOrders = await _orderRepository.GetListAsync(x => - x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), - x => new { x.Id, x.OrderNo }); - - if (canLinkOrders.Count == 0) return new List(); - - await _orderRepository.LinkOrderAsync(canLinkOrders.Select(x => new OrderLinkEntity - { - OrderId = orderId, - OrderNo = input.OrderNo, - OrderType = input.OrderType, - LinkOrderId = x.Id, - LinkOrderNo = x.OrderNo, - LinkOrderType = input.LinkOrderType - }).ToList()); - - return canLinkOrders.Select(x => x.Id).ToList(); - } - - private async Task UnLinkOrderAsync(LinkOrderInput input) - { - var unLinkIds = await _orderLinkQuery.GetListAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && - x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), - x => x.Id); - - // real del - await _orderRepository.UnLinkByIdsAsync(unLinkIds); - - return true; - } -} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 712b775c..ce4913bc 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -1,7 +1,9 @@ using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; using SJZY.UserCenter.HttpApi.Services; @@ -15,6 +17,9 @@ namespace SJZY.Track.Application.Services.ProvideServices; public partial class OrderService : ApplicationService, IOrderService { private readonly IOrderRepository _orderRepository; + private readonly IBasicQuery _orderLinkQuery; + private readonly ICapPublisher _capPublisher; + public OrderService(IOrderRepository orderRepository, IBasicQuery orderLinkQuery, ICapPublisher capPublisher) @@ -79,4 +84,100 @@ public partial class OrderService : ApplicationService, IOrderService order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos); await _orderRepository.UpdateOrderAsync(order); } + + /// + /// 关联、解除关联订单 + /// + /// + /// + /// + [HttpPost("Order/Link")] + public async Task LinkOrderAsync(LinkOrderInput input) + { + var order = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new + { + x.Id, + x.SubSystemId + }); + if (order == default) + { + throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); + } + + //tips：循环关联问题再消费时解决 + if (input.OrderType == input.LinkOrderType) + { + throw new BusinessException(message: "不能同级关联"); + } + + if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; + + // 单号去重，去空，去自己 + input.LinkOrderNos = input.LinkOrderNos + .Where(x => !x.IsNullOrWhiteSpace() && x != input.OrderNo) + .Distinct().ToList(); + + // 解绑 + if (!input.IsLink) return await UnLinkOrderAsync(input); + + // 关联订单 + var linkedOrderIds = await DoLinkOrderAsync(input, order.Id); + + // 补轨迹 + if (linkedOrderIds.Count > 0) + { + await _capPublisher.PublishAsync(GlobalConst.OrderLinkAfterFillTrack, new OrderLinkAfterFillTrackEvent + { + OrderId = order.Id, + SubSystemId = order.SubSystemId, + LinkedOrderIds = linkedOrderIds, + }); + } + + return true; + } + + private async Task> DoLinkOrderAsync(LinkOrderInput input, int orderId) + { + // 获取已关联的订单 + var linkOrderNos = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, + x => x.LinkOrderNo); + + // 计算出未关联的订单 + var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); + + // 过滤掉不存在的订单 + var canLinkOrders = await _orderRepository.GetListAsync(x => + x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), + x => new { x.Id, x.OrderNo }); + + if (canLinkOrders.Count == 0) return new List(); + + await _orderRepository.LinkOrderAsync(canLinkOrders.Select(x => new OrderLinkEntity + { + OrderId = orderId, + OrderNo = input.OrderNo, + OrderType = input.OrderType, + LinkOrderId = x.Id, + LinkOrderNo = x.OrderNo, + LinkOrderType = input.LinkOrderType + }).ToList()); + + return canLinkOrders.Select(x => x.Id).ToList(); + } + + private async Task UnLinkOrderAsync(LinkOrderInput input) + { + var unLinkIds = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && + x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), + x => x.Id); + + // real del + await _orderRepository.UnLinkByIdsAsync(unLinkIds); + + return true; + } } \ No newline at end of file From f24168b62da902dad61d02462ae46009f3306a14 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Fri, 29 Mar 2024 11:40:00 +0800 Subject: [PATCH 07/16] Revert "debug" This reverts commit a02e4ca8b230a37c161201613a466767eb5a97a2. --- .../ProvideServices/OrderService.Link.cs | 112 ++++++++++++++++++ .../Services/ProvideServices/OrderService.cs | 101 ---------------- 2 files changed, 112 insertions(+), 101 deletions(-) create mode 100644 src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs new file mode 100644 index 00000000..88eb9530 --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -0,0 +1,112 @@ +using DotNetCore.CAP; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Consts; +using SJZY.Track.Domain.Queries; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 订单关联服务 +/// +public partial class OrderService +{ + private readonly IBasicQuery _orderLinkQuery; + private readonly ICapPublisher _capPublisher; + + /// + /// 关联、解除关联订单 + /// + /// + /// + /// + [HttpPost("Order/Link")] + public async Task LinkOrderAsync(LinkOrderInput input) + { + var order = await _orderRepository.GetFirstAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new + { + x.Id, x.SubSystemId + }); + if (order == default) + { + throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); + } + + //tips：循环关联问题再消费时解决 + if (input.OrderType == input.LinkOrderType) + { + throw new BusinessException(message: "不能同级关联"); + } + + if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; + + // 单号去重，去空，去自己 + input.LinkOrderNos = input.LinkOrderNos + .Where(x => !x.IsNullOrWhiteSpace() && x != input.OrderNo) + .Distinct().ToList(); + + // 解绑 + if (!input.IsLink) return await UnLinkOrderAsync(input); + + // 关联订单 + var linkedOrderIds = await DoLinkOrderAsync(input, order.Id); + + // 补轨迹 + if (linkedOrderIds.Count > 0) + { + await _capPublisher.PublishAsync(GlobalConst.OrderLinkAfterFillTrack, new OrderLinkAfterFillTrackEvent + { + OrderId = order.Id, + SubSystemId = order.SubSystemId, + LinkedOrderIds = linkedOrderIds, + }); + } + + return true; + } + + private async Task> DoLinkOrderAsync(LinkOrderInput input, int orderId) + { + // 获取已关联的订单 + var linkOrderNos = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, + x => x.LinkOrderNo); + + // 计算出未关联的订单 + var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); + + // 过滤掉不存在的订单 + var canLinkOrders = await _orderRepository.GetListAsync(x => + x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), + x => new { x.Id, x.OrderNo }); + + if (canLinkOrders.Count == 0) return new List(); + + await _orderRepository.LinkOrderAsync(canLinkOrders.Select(x => new OrderLinkEntity + { + OrderId = orderId, + OrderNo = input.OrderNo, + OrderType = input.OrderType, + LinkOrderId = x.Id, + LinkOrderNo = x.OrderNo, + LinkOrderType = input.LinkOrderType + }).ToList()); + + return canLinkOrders.Select(x => x.Id).ToList(); + } + + private async Task UnLinkOrderAsync(LinkOrderInput input) + { + var unLinkIds = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && + x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), + x => x.Id); + + // real del + await _orderRepository.UnLinkByIdsAsync(unLinkIds); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index ce4913bc..712b775c 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -1,9 +1,7 @@ using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; using SJZY.UserCenter.HttpApi.Services; @@ -17,9 +15,6 @@ namespace SJZY.Track.Application.Services.ProvideServices; public partial class OrderService : ApplicationService, IOrderService { private readonly IOrderRepository _orderRepository; - private readonly IBasicQuery _orderLinkQuery; - private readonly ICapPublisher _capPublisher; - public OrderService(IOrderRepository orderRepository, IBasicQuery orderLinkQuery, ICapPublisher capPublisher) @@ -84,100 +79,4 @@ public partial class OrderService : ApplicationService, IOrderService order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos); await _orderRepository.UpdateOrderAsync(order); } - - /// - /// 关联、解除关联订单 - /// - /// - /// - /// - [HttpPost("Order/Link")] - public async Task LinkOrderAsync(LinkOrderInput input) - { - var order = await _orderRepository.GetFirstAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new - { - x.Id, - x.SubSystemId - }); - if (order == default) - { - throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); - } - - //tips：循环关联问题再消费时解决 - if (input.OrderType == input.LinkOrderType) - { - throw new BusinessException(message: "不能同级关联"); - } - - if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; - - // 单号去重，去空，去自己 - input.LinkOrderNos = input.LinkOrderNos - .Where(x => !x.IsNullOrWhiteSpace() && x != input.OrderNo) - .Distinct().ToList(); - - // 解绑 - if (!input.IsLink) return await UnLinkOrderAsync(input); - - // 关联订单 - var linkedOrderIds = await DoLinkOrderAsync(input, order.Id); - - // 补轨迹 - if (linkedOrderIds.Count > 0) - { - await _capPublisher.PublishAsync(GlobalConst.OrderLinkAfterFillTrack, new OrderLinkAfterFillTrackEvent - { - OrderId = order.Id, - SubSystemId = order.SubSystemId, - LinkedOrderIds = linkedOrderIds, - }); - } - - return true; - } - - private async Task> DoLinkOrderAsync(LinkOrderInput input, int orderId) - { - // 获取已关联的订单 - var linkOrderNos = await _orderLinkQuery.GetListAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, - x => x.LinkOrderNo); - - // 计算出未关联的订单 - var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); - - // 过滤掉不存在的订单 - var canLinkOrders = await _orderRepository.GetListAsync(x => - x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), - x => new { x.Id, x.OrderNo }); - - if (canLinkOrders.Count == 0) return new List(); - - await _orderRepository.LinkOrderAsync(canLinkOrders.Select(x => new OrderLinkEntity - { - OrderId = orderId, - OrderNo = input.OrderNo, - OrderType = input.OrderType, - LinkOrderId = x.Id, - LinkOrderNo = x.OrderNo, - LinkOrderType = input.LinkOrderType - }).ToList()); - - return canLinkOrders.Select(x => x.Id).ToList(); - } - - private async Task UnLinkOrderAsync(LinkOrderInput input) - { - var unLinkIds = await _orderLinkQuery.GetListAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && - x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), - x => x.Id); - - // real del - await _orderRepository.UnLinkByIdsAsync(unLinkIds); - - return true; - } } \ No newline at end of file From 3a179e743622f10a645fe55a49fe58b69fef88a6 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Fri, 29 Mar 2024 14:14:19 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8C=85=20=20unifyResultDto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/IOrderService.cs | 6 +++--- .../ProvideServices/OrderService.Link.cs | 17 +++++++++-------- .../Services/ProvideServices/OrderService.cs | 11 ++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs index 0dd34413..adff3b24 100644 --- a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs +++ b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs @@ -10,19 +10,19 @@ public interface IOrderService : IRemoteService /// /// /// - Task UpsertAsync(UpsertOrderInput input); + Task UpsertAsync(UpsertOrderInput input); /// /// 删除订单 /// /// /// - Task DeleteOrderAsync(DeleteOrderInput input); + Task DeleteOrderAsync(DeleteOrderInput input); /// /// 关联订单 /// /// /// - Task LinkOrderAsync(LinkOrderInput input); + Task LinkOrderAsync(LinkOrderInput input); } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs index 88eb9530..7226ee0f 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -22,13 +22,14 @@ public partial class OrderService /// /// [HttpPost("Order/Link")] - public async Task LinkOrderAsync(LinkOrderInput input) + public async Task LinkOrderAsync(LinkOrderInput input) { var order = await _orderRepository.GetFirstAsync(x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new - { - x.Id, x.SubSystemId - }); + { + x.Id, + x.SubSystemId + }); if (order == default) { throw new BusinessException(message: $"订单：{input.OrderNo}不存在"); @@ -40,7 +41,7 @@ public partial class OrderService throw new BusinessException(message: "不能同级关联"); } - if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; + if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return new UnifyResultDto(true); // 单号去重，去空，去自己 input.LinkOrderNos = input.LinkOrderNos @@ -64,7 +65,7 @@ public partial class OrderService }); } - return true; + return new UnifyResultDto(true); } private async Task> DoLinkOrderAsync(LinkOrderInput input, int orderId) @@ -97,7 +98,7 @@ public partial class OrderService return canLinkOrders.Select(x => x.Id).ToList(); } - private async Task UnLinkOrderAsync(LinkOrderInput input) + private async Task UnLinkOrderAsync(LinkOrderInput input) { var unLinkIds = await _orderLinkQuery.GetListAsync(x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && @@ -107,6 +108,6 @@ public partial class OrderService // real del await _orderRepository.UnLinkByIdsAsync(unLinkIds); - return true; + return new UnifyResultDto(true); } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 712b775c..d562ef9b 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -30,7 +30,7 @@ public partial class OrderService : ApplicationService, IOrderService /// /// [HttpPost("Order/Upsert")] - public async Task UpsertAsync(UpsertOrderInput input) + public async Task UpsertAsync(UpsertOrderInput input) { if (input.Templates.Count == 0) throw new BusinessException(message: "至少有一个模板"); var order = await _orderRepository.GetFirstAsync(x => @@ -39,7 +39,8 @@ public partial class OrderService : ApplicationService, IOrderService { // 订单已存在则视为更新 await UpdateOrderAsync(input, order); - return "更新成功"; + + return new UnifyResultDto() { Code = "200", Msg = "操作成功", Data = "创建成功" }; } order = ObjectMapper.Map(input); @@ -48,7 +49,7 @@ public partial class OrderService : ApplicationService, IOrderService order.OrderFlights = ObjectMapper.Map, List>(input.FlightInfos); await _orderRepository.CreateOrderAsync(order); - return "创建成功"; + return new UnifyResultDto() { Code = "200", Msg = "操作成功", Data = "新增成功" }; } /// @@ -58,7 +59,7 @@ public partial class OrderService : ApplicationService, IOrderService /// /// [HttpPost("Order/Delete")] - public async Task DeleteOrderAsync(DeleteOrderInput input) + public async Task DeleteOrderAsync(DeleteOrderInput input) { var orderId = await _orderRepository.GetFirstAsync(x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id); @@ -69,7 +70,7 @@ public partial class OrderService : ApplicationService, IOrderService await _orderRepository.DeleteOrderAsync(orderId); - return true; + return new UnifyResultDto(true); } private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order) From ba095bd49849dadfd467bf194a823be9bc2a56a5 Mon Sep 17 00:00:00 2001 From: dingenwen <543338760@qq.com> Date: Mon, 1 Apr 2024 16:48:26 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Api/appsettings.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/SJZY.Track.Api/appsettings.json b/src/SJZY.Track.Api/appsettings.json index b88d44ad..676973d6 100644 --- a/src/SJZY.Track.Api/appsettings.json +++ b/src/SJZY.Track.Api/appsettings.json @@ -7,9 +7,7 @@ "Env": "DEV", "Namespace": "Dev", "MetaServer": "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080", - "ConfigServer": [ - "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" - ] + "ConfigServer": [ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" ] } }, "Kestrel": { From bebb84bddacdc95876a1f4cf32d924fd443c07c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Fri, 12 Apr 2024 21:40:17 +0800 Subject: [PATCH 10/16] =?UTF-8?q?change=EF=BC=9A=E5=8F=8C=E8=AE=A2?= =?UTF-8?q?=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackUpsertEventHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs index 81e954fe..0ce9623c 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -27,7 +27,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe } [CapSubscribe(GlobalConst.TrackUpsertSubscribe, Group = GlobalConst.TrackUpsertSubscribe)] - [CapSubscribe(GlobalConst.TrackUpsertSubscribe, Group = GlobalConst.TrackUpsertSubscribe)] + [CapSubscribe(GlobalConst.TrackUpsertForRefreshSubscribe, Group = GlobalConst.TrackUpsertForRefreshSubscribe)] public async Task ConsumerAsync(TrackUpsertEvent @event) { var orderIds = @event.OrderIdentifiers.Select(x => x.OrderId).ToArray(); From 77d2275afa6fb9bf4c958da6d4829ba18cb9115c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 15 Apr 2024 09:03:04 +0800 Subject: [PATCH 11/16] =?UTF-8?q?fix=EF=BC=9Aorder=20link=20query=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackDeleteEventHandler.cs | 2 +- .../EventHandlers/TrackUpsertEventHandler.cs | 2 +- src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs | 5 +++++ src/SJZY.Track.Repository/Repositories/OrderRepository.cs | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs index ea6698fb..fc413d98 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs @@ -42,7 +42,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe var linkedOrders = await _orderRepository.GetLinkedOrdersAsync(@event.OrderIds); foreach (var orderId in @event.OrderIds) { - foreach (var group in linkedOrders.Where(x => x.OrderId == orderId) + foreach (var group in linkedOrders.Where(x => x.OwnerOrderId == orderId) .GroupBy(x => x.SubSystemId)) { var nextEvent = @event.DeepCopy(); diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs index 0ce9623c..81d7e461 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -46,7 +46,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe foreach (var order in @event.OrderIdentifiers) { // 理论上小包在这不会分组 - foreach (var group in linkedOrders.Where(x => x.OrderId == order.OrderId) + foreach (var group in linkedOrders.Where(x => x.OwnerOrderId == order.OrderId) .GroupBy(x => x.SubSystemId)) { var nextEvent = @event.DeepCopy(); diff --git a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs index c6eea835..5b81e796 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs @@ -2,6 +2,11 @@ public class LinkedOrderVO { + /// + /// 被关联订单id + /// + public int OwnerOrderId { get; set; } + /// /// 关联订单id /// diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 5e78fc5f..93edf756 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -74,6 +74,7 @@ AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0;"); .Where(a => orderIds.Contains(a.OrderId)) .Select((a, b) => new LinkedOrderVO { + OwnerOrderId = a.OrderId, OrderId = b.Id, OrderNo = b.OrderNo, OrderType = b.OrderType, From ff49c0879a56d1b06e8ff5fa9ddee6c64fbb51b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 15 Apr 2024 09:25:34 +0800 Subject: [PATCH 12/16] =?UTF-8?q?change=EF=BC=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E7=A9=BA=E6=95=B0=E6=8D=AE=E7=94=A8--=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackDeleteEventHandler.cs | 2 +- .../EventHandlers/TrackUpsertEventHandler.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs index fc413d98..cf076a42 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs @@ -49,7 +49,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe nextEvent.Visited.AddRange(@event.OrderIds); nextEvent.TrackCodes = @event.TrackCodes; nextEvent.SubSystemId = group.Key; - + nextEvent.OrderIds = group.Select(x => x.OrderId).ToArray(); // 不同子系统需要做内容映射 if (@event.SubSystemId != nextEvent.SubSystemId) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs index 81d7e461..192a1b87 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -60,9 +60,9 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe }).ToArray(); nextEvent.TrackRefreshData = new TrackRefreshStruct { - ServiceProviderName = @event.TrackRefreshData.ServiceProviderName, - OriginTrackContent = @event.TrackRefreshData.OriginTrackContent, - OriginTrackData = @event.TrackRefreshData.OriginTrackData, + ServiceProviderName = @event.TrackRefreshData.ServiceProviderName ?? GlobalConst.EmptyString, + OriginTrackContent = @event.TrackRefreshData.OriginTrackContent ?? GlobalConst.EmptyString, + OriginTrackData = @event.TrackRefreshData.OriginTrackData ?? GlobalConst.EmptyString, // tips：一定要重置为false，父级订单的完成不会使得关联订单完成，关联单也必须由刷新来完成或手动设置完成！！ IsCompleted = false }; From f62c73a93e1cdb4d1e37e5c9b3123cfee07dc47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 15 Apr 2024 09:58:07 +0800 Subject: [PATCH 13/16] format --- .../EventHandlers/TrackDeleteEventHandler.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs index cf076a42..ccd4d0d5 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs @@ -84,6 +84,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe new TrackChangeAfterUpdateOrderEvent { OrderIds = @event.OrderIds, + TrackCode = @event.TrackCodes.JoinAsString(","), IsDelete = true }); } From 49bf17694458678b0655fc3ea20d3933f7500f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 15 Apr 2024 10:10:37 +0800 Subject: [PATCH 14/16] publish --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d53fbc8a..342ca2ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ ## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. +## files generated by popular Visual Studio add-ons.. # User-specific files *.suo From 97a71aaffa6bd89e23078bf7eee6af7965c8f34e Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Mon, 15 Apr 2024 10:23:14 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/ProvideServices/GetPageTrackOrderInput.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index 2ddf9d9a..d9c87ab0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -22,6 +22,16 @@ public class GetPageTrackOrderInput : PageInfoInput /// public int TabType { get; set; } + /// + /// 订单类型 + /// + public int? TrackOrderType { get; set; } + + /// + /// 客户id + /// + public int? CustomerId { get; set; } + ///// ///// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4] ///// From a7d5c8c9cc44a11020f6765091efa8d2913cc352 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Mon, 15 Apr 2024 10:26:13 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Options/GetCamsUrlOptions.cs | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs diff --git a/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs deleted file mode 100644 index 82677724..00000000 --- a/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs +++ /dev/null @@ -1,17 +0,0 @@ -using SJZY.Expand.ABP.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Application.Options -{ - public class GetCamsUrlOptions : IOptionAutoInjection - { - /// - /// 2.5URL - /// - public string? Cams25URL { get; set; } - } -}