11

REBORN.Services.DMCService/TravelServiceReport.cs

@@ -1410,7 +1410,12 @@ namespace REBORN.Services.DMCService
             //获取房间信息
             var houseList = module.GetOrderHouseList(new RB_Travel_OrderHouse_Extend { TCID = ID });
             List<object> result = new List<object>();
-            foreach (var subItem in data.Where(qitem => qitem.GroupType != OrderJoinType.SingleAirTicket))
+            var tempList = data.Where(qitem => qitem.GroupType != OrderJoinType.SingleAirTicket)?.OrderBy(qitem =>
+            {
+                Int32.TryParse(qitem.HouseNo, out int HouseNo);
+                return HouseNo;
+            })?.ToList();
+            foreach (var subItem in tempList)
             {
                 string CreateByStr = "";
                 if ((subItem?.EnterID ?? 0) > 0)

REBORN.Services.SellService/SellOrderService.cs

@@ -9829,7 +9829,11 @@ namespace REBORN.Services.SellService
                 price.TCID,
                 CoverImg,
                 OrderBackScenicList = orderBackScenicList?.Select(x => new { x.Id, x.Number, x.BackMoney, x.CouponsName, x.CouponsId, GuestBackScenicName = (x.GuestBlackList != null && x.GuestBlackList.Any()) ? string.Join("、", x.GuestBlackList.Select(z => z.GuestName)) : "" }),
-                list = list.Select(x => new
+                list = list?.OrderBy(qitem =>
+                {
+                    Int32.TryParse(qitem.HouseNo, out int HouseNo);
+                    return HouseNo;
+                })?.Select(x => new
                 {
                     x.GuestSurveyID,
                     ScoreNum = x.ScoreNum.ToString("#0.00"),