From 248057f55f510ab7a18189aabb837415b58fa2fa Mon Sep 17 00:00:00 2001 From: zhangxiaofeng Date: Thu, 1 Feb 2024 15:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B8=AA=E8=AE=A2=E9=98=85=EF=BC=9A?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AE=A2=E8=88=B1=E6=97=B6=EF=BC=8C=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=87=AA=E5=8A=A8=E8=AE=A2=E9=98=85=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E6=B8=AF=E8=BF=90=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Event/BillTraceSubscriber.cs | 30 +++++++++---------- .../BookingOrder/BookingOrderService.cs | 27 ++++++++--------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/Myshipping.Application/Event/BillTraceSubscriber.cs b/Myshipping.Application/Event/BillTraceSubscriber.cs index 0a3d05b6..d5efc343 100644 --- a/Myshipping.Application/Event/BillTraceSubscriber.cs +++ b/Myshipping.Application/Event/BillTraceSubscriber.cs @@ -117,24 +117,24 @@ namespace Myshipping.Application.Event YardCode = order.YARDID == "" ? null : order.YARDID, CARRIER = order.CARRIER == "" ? null : order.CARRIER, CARRIERID = order.CARRIERID == "" ? null : order.CARRIERID, - isBook = true, + isBook = false, AlertEmail = string.Join(";", emailList) }); - var status = string.Empty; - if (!string.IsNullOrWhiteSpace(order.YARDID) && !string.IsNullOrWhiteSpace(order.CARRIERID)) - { - status = "订阅起运港,目的港"; - } - else - if (string.IsNullOrWhiteSpace(order.YARDID) && !string.IsNullOrWhiteSpace(order.CARRIERID)) - { - status = "订阅目的港"; - } - else if (!string.IsNullOrWhiteSpace(order.YARDID) && string.IsNullOrWhiteSpace(order.CARRIERID)) - { - status = "订阅起运港"; - } + var status = "订阅起运港"; + //if (!string.IsNullOrWhiteSpace(order.YARDID) && !string.IsNullOrWhiteSpace(order.CARRIERID)) + //{ + // status = "订阅起运港,目的港"; + //} + //else + //if (string.IsNullOrWhiteSpace(order.YARDID) && !string.IsNullOrWhiteSpace(order.CARRIERID)) + //{ + // status = "订阅目的港"; + //} + //else if (!string.IsNullOrWhiteSpace(order.YARDID) && string.IsNullOrWhiteSpace(order.CARRIERID)) + //{ + // status = "订阅起运港"; + //} var stalogids = _repStatuslog.AsQueryable().Filter(null, true).Where(x => x.BookingId == order.Id).Select(x => x.Id).ToList(); _repBookingStatus.Delete(x => x.BookingId == order.Id); _repStatuslogDetail.Delete(x => stalogids.Contains(x.PId)); diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 5b24a19c..8fac421b 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1566,21 +1566,20 @@ namespace Myshipping.Application //判断是否订阅运踪目的港起运港标识 if (!string.IsNullOrEmpty(entity.MBLNO)) { - if (!string.IsNullOrEmpty(entity.CARRIERID) && !string.IsNullOrEmpty(entity.YARDID)) - { - entity.IsBookingYZ = "3"; - - } - if (!string.IsNullOrEmpty(entity.CARRIERID) && string.IsNullOrEmpty(entity.YARDID)) - { - entity.IsBookingYZ = "2"; - - } - if (string.IsNullOrEmpty(entity.CARRIERID) && !string.IsNullOrEmpty(entity.YARDID)) - { - entity.IsBookingYZ = "1"; + entity.IsBookingYZ = "1"; - } + //if (!string.IsNullOrEmpty(entity.CARRIERID) && !string.IsNullOrEmpty(entity.YARDID)) + //{ + // entity.IsBookingYZ = "3"; + //} + //if (!string.IsNullOrEmpty(entity.CARRIERID) && string.IsNullOrEmpty(entity.YARDID)) + //{ + // entity.IsBookingYZ = "2"; + //} + //if (string.IsNullOrEmpty(entity.CARRIERID) && !string.IsNullOrEmpty(entity.YARDID)) + //{ + // entity.IsBookingYZ = "1"; + //} } else {