11

REBORN.Module.SellModule/SellOrderModule.cs

@@ -18749,7 +18749,11 @@ namespace REBORN.Module.SellModule
         /// <returns></returns>
         public List<RB_Travel_Order_Extend> GetTravelOrderList2026Module(int pageIndex, int pageSize, RB_Travel_Order_Extend model, out long count, string lineIdStr = "", bool isGetLeader = true, bool isGetCouponAllotInfo = false)
         {
-            var list = orderRepository.GetTravelOrderPage2026Repository(pageIndex, pageSize, model, out count, lineIdStr: lineIdStr, isGetLeader: isGetLeader);
+            var list = new List<RB_Travel_Order_Extend>();
+            count = 0;
+            try
+            {
+                list = orderRepository.GetTravelOrderPage2026Repository(pageIndex, pageSize, model, out count, lineIdStr: lineIdStr, isGetLeader: isGetLeader);
                 List<int> OrderIntL = list.Select(x => x.OrderId).ToList();
                 List<Rb_Coupon_Allot_Extend> couponList = new List<Rb_Coupon_Allot_Extend>();
                 List<int> couponIdList = new List<int>();
@@ -18872,7 +18876,7 @@ namespace REBORN.Module.SellModule
 
                     //其它合同
                     var otherContractList = new List<RB_Travel_Contract_Extend>();
-                otherContractList= travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
+                    otherContractList = travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
 
                     #region 同行联系人LD
                     var customerChildList = new List<Rb_Customer_InfoChildren>();
@@ -19222,6 +19226,11 @@ namespace REBORN.Module.SellModule
                         }
                     }
                 }
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "GetTravelOrderList2026Module_");
+            }
             return list;
         }
 

REBORN.Services.SellService/SellOrderService.cs

@@ -2282,12 +2282,6 @@ namespace REBORN.Services.SellService
             {
                 return ApiResult.ParamIsNull(message);
             }
-            //团队人数变化,推送消息给地接用餐
-            int newGuestNum = sellOrderModule.GetTravelOrderGuestNumModule((dmodel?.TCID ?? 0));
-            if (oldGuestNum != newGuestNum)
-            {
-                sellOrderModule.PushOrderNumChangeMessageModule((dmodel?.TCID ?? 0), oldGuestNum, newGuestNum);
-            }
             return ApiResult.Success(updateScenic + "订单操作成功", isUpdateGuest);
         }
 
@@ -12551,7 +12545,16 @@ namespace REBORN.Services.SellService
             OrderInfo.Sort = 3;
             int isNormal = parm.GetInt("isNormal");
             List<RB_Travel_Order_Extend> list = sellOrderModule.GetTravelOrderList2026Module(pmodel.pageIndex, pmodel.pageSize, OrderInfo, out long count, "", false, true);
-            var data = OrderToResult(list, userInfo);
+            var data = new List<object>();
+            try
+            {
+                data= OrderToResult(list, userInfo);
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "GetTravelOrderPage");
+            }
+            
             pmodel.count = int.Parse(count.ToString());
             pmodel.pageData = data;
             return ApiResult.Success("", data: JsonHelper.GetCamelCaseResultJson(pmodel));