客户订舱接口

Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs

@@ -720,7 +720,7 @@ namespace Myshipping.Application
                 throw Oops.Bah("大简云接收订舱用户key和秘钥未配置，请联系管理员");
             }
 
-            var orderList = _rep.AsQueryable().Where(x => ids.Contains(x.Id)).ToList();
+            var orderList = _rep.AsQueryable().Filter(null, true).Where(x => ids.Contains(x.Id)).ToList();
             var noSubmitList = orderList.Where(x => x.BSSTATUS != "已提交").Select(x => x.BOOKINGNO).ToList();
             if (noSubmitList.Count > 0)
             {
@@ -771,7 +771,7 @@ namespace Myshipping.Application
                     var succ = item.GetBooleanValue("success");
                     if (succ)
                     {
-                        var model = _rep.AsQueryable().First(x => x.Id == id);
+                        var model = _rep.AsQueryable().Filter(null, true).First(x => x.Id == id);
                         model.BSSTATUS = "已录入";
                         await _rep.UpdateAsync(model);
 
@@ -1822,7 +1822,11 @@ namespace Myshipping.Application
                     throw Oops.Bah("当前状态不能修改");
                 }
 
-                await CancelSubmit(new List<long>() { custOrder.Id });
+                if (custOrder.BSSTATUS == "已提交")
+                {
+                    await CancelSubmit(new List<long>() { custOrder.Id });
+                    custOrder = await _rep.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == custOrder.Id); //取消后重新拉取一遍数据
+                }
 
 
                 input.Id = custOrder.Id;