1

REBORN.Module.DataStatisticsModule/FinanceStatisticsModule.cs

@@ -596,6 +596,65 @@ namespace REBORN.Module.DataStatisticsModule
                 x.TravelStatus = (int)(travelList.Where(y => y.TCID == x.TCID).FirstOrDefault()?.Status ?? GroupStateEnum.Normal);
             });
 
+            if (list.Where(x => x.DataType != 1).Any()) {
+                var airlist = list.Where(x => x.DataType == 16).ToList();
+                if (airlist.Any())
+                {
+                    string orderIds = string.Join(",", airlist.Select(x => x.TCID));
+                    var rairlist = cRMTicket_OrderRepository.GetGuestOrderStatisticsPageList(orderIds, model.Rb_Group_Id ?? 0);
+
+                    foreach (var item in airlist)
+                    {
+                        var rairModel = rairlist.Where(x => x.OrderId == item.TCID).FirstOrDefault();
+                        item.TravelStatus = (rairModel?.OrderStatus ?? 0) == 5 || (rairModel?.OrderStatus ?? 0) == 6 ? 2 : 1;
+                    }
+                }
+                //内部酒店
+                var hotellist = list.Where(x => x.DataType == 17).ToList();
+                if (hotellist.Any())
+                {
+                    var rtlist = customer_HotelOrderRepository.GetList(new RB_Customer_HotelOrder_Extend() { GroupId = model.Rb_Group_Id ?? 0, OrderIds = string.Join(",", hotellist.Select(x => x.TCID)) });
+                    foreach (var item in hotellist)
+                    {
+                        var rmodel = rtlist.Where(x => x.OrderId == item.TCID).FirstOrDefault();
+                        item.TravelStatus = (rmodel?.IsFinish ?? 0) == 1 ? 2 : 1;
+                    }
+                }
+                //门票
+                var ticketlist = list.Where(x => x.DataType == 19).ToList();
+                if (ticketlist.Any())
+                {
+                    var rtlist = customer_TicketOrderRepository.GetList(new RB_Customer_TicketOrder_Extend() { GroupId = model.Rb_Group_Id ?? 0, OrderIds = string.Join(",", ticketlist.Select(x => x.TCID)) });
+                    foreach (var item in ticketlist)
+                    {
+                        var rmodel = rtlist.Where(x => x.OrderId == item.TCID).FirstOrDefault();
+                        item.TravelStatus = (rmodel?.IsFinish ?? 0) == 1 ? 2 : 1;
+                    }
+                }
+                //包车
+                var carlist = list.Where(x => x.DataType == 18).ToList();
+                if (carlist.Any())
+                {
+                    var rtlist = customer_CarOrderRepository.GetCarOrderList(new RB_Customer_CarOrder_Extend() { GroupId = model.Rb_Group_Id ?? 0, OrderIds = string.Join(",", carlist.Select(x => x.TCID)) });
+                    foreach (var item in carlist)
+                    {
+                        var rmodel = rtlist.Where(x => x.OrderId == item.TCID).FirstOrDefault();
+                        item.TravelStatus = (rmodel?.IsFinish ?? 0) == 1 ? 2 : 1;
+                    }
+                }
+                //单签证
+                var visalist = list.Where(x => x.DataType == 3).ToList();
+                if (visalist.Any())
+                {
+                    var rtlist = sell_VisaOrderRepository.GetOrderList(new RB_Sell_VisaOrder_Extend() { RB_Group_Id = model.Rb_Group_Id ?? 0, OrderIds = string.Join(",", visalist.Select(x => x.TCID)) });
+                    foreach (var item in visalist)
+                    {
+                        var rmodel = rtlist.Where(x => x.Id == item.TCID).FirstOrDefault();
+                        item.TravelStatus = (rmodel?.IsFinish ?? 0) == 1 ? 2 : 1;
+                    }
+                }
+            }
+
             #region 查询 和服体验的 地接团号
             if (list.Where(x => x.DataType == 27).Any()) {
                 //查询关联的 支出单 对应的  团队地接团号