Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

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));