1

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -6118,14 +6118,12 @@ namespace Myshipping.Application
             var key = _cache.GetAllSysConfig().Result.Where(x => x.Code == "billTraceNewUserKey").Select(x => x.Value).FirstOrDefault();
             if (string.IsNullOrEmpty(key))
             {
-
                 throw Oops.Bah("未获取到相关KEY，请联系管理员！");
             }
 
             var secret = _cache.GetAllSysConfig().Result.Where(x => x.Code == "billTraceNewUserSecret").Select(x => x.Value).FirstOrDefault();
             if (string.IsNullOrEmpty(secret))
             {
-
                 throw Oops.Bah("未获取到相关SECRET，请联系管理员！");
             }
 
@@ -6157,16 +6155,15 @@ namespace Myshipping.Application
             var yjlk_time = item.GetDateTimeValue("yjlk_time");//预计离港时间
             var sjdk_time = item.GetDateTimeValue("sjdk_time");//实际到港时间
             var sjlg_time = item.GetDateTimeValue("sjlg_time");//实际离港时间
-
-            //order.StartETA = yjdk_time;
-            //order.YgtETD = yjlk_time;
-            //order.StartATA = sjdk_time;
-            //order.ATD = sjlg_time;
-            //await _rep.AsUpdateable(order).IgnoreColumns().ExecuteCommandAsync();
-
-            var list=await _rep.AsQueryable().Filter(null, true).Where(x=>x.IsDeleted==false&&x.TenantId==UserManager.TENANT_ID&&x.CARRIERID==order.CARRIERID&&x.VESSEL==order.VESSEL)
-                .WhereIF(!string.IsNullOrEmpty(order.VOYNO), x => x.VOYNO == order.VOYNO)
-                    .WhereIF(!string.IsNullOrEmpty(order.VOYNOINNER), x => x.VOYNOINNER == order.VOYNOINNER).ToListAsync();
+            _logger.LogInformation("船期："+  yjdk_time + yjlk_time + sjdk_time + sjlg_time);
+            order.StartETA = yjdk_time;
+            order.YgtETD = yjlk_time;
+            order.StartATA = sjdk_time;
+            order.ATD = sjlg_time;
+            await _rep.AsUpdateable(order).IgnoreColumns().ExecuteCommandAsync();
+
+            var list=await _rep.AsQueryable().Filter(null, true).Where(x=>x.IsDeleted==false&&x.TenantId==UserManager.TENANT_ID&&x.CARRIERID==order.CARRIERID&&x.VESSEL==order.VESSEL&& x.VOYNO == order.VOYNO && x.Id!=order.Id)
+                .WhereIF(!string.IsNullOrEmpty(order.VOYNOINNER), x => x.VOYNOINNER == order.VOYNOINNER).ToListAsync();
             foreach (var it in list)
             {
                 it.StartETA = yjdk_time;
@@ -6175,7 +6172,7 @@ namespace Myshipping.Application
                 it.ATD = sjlg_time;
                 await _rep.AsUpdateable(it).IgnoreColumns().ExecuteCommandAsync();
             }
-            return list.Where(x=>x.Id==order.Id).FirstOrDefault();
+            return order;
         }
 
 

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -2154,7 +2154,7 @@ namespace Myshipping.Application
 
 
                 //推送钉钉消息
-                DingTalkGroupHelper.SendDingTalkGroupMessage("hechuanCompareNotify", "船期获取异常提醒", msg);
+                DingTalkGroupHelper.SendDingTalkGroupMessage("hechuanVesselExcepNotify", "船期获取异常提醒", msg);
             }
         }