1

REBORN.Model/Extend/Dmc/RB_Travel_Order_Extend.cs

@@ -301,6 +301,10 @@ namespace REBORN.Model.Extend.Dmc
         /// </summary>
         public int? Status { get; set; }
 
+        /// <summary>
+        /// 结团查询  1只看已结团  2只看未结团
+        /// </summary>
+        public int IsFinish { get; set; }
 
         /// <summary>
         /// 结团审核时间

REBORN.Repository/Dmc/RB_Customer_HotelOrderRepository.cs

@@ -191,6 +191,18 @@ namespace REBORN.Repository.Dmc
             {
                 where += $" and o.{nameof(RB_Customer_HotelOrder_Extend.OrderStatus)}  in (1,2,4)";
             }
+            if (demodel.IsFinish > 0)
+            {
+                if (demodel.IsFinish == 1)
+                {
+                    where += $@" AND o.{nameof(RB_Customer_HotelOrder_Extend.IsFinish)}= 1";
+                }
+                else
+                {
+                    where += $@" AND o.{nameof(RB_Customer_HotelOrder_Extend.IsFinish)}<> 1";
+                }
+            }
+
             string sql = $@"select o.* from RB_Customer_HotelOrder o
 left join rb_customer_hotelorderdetail d on o.OrderId = d.OrderId
 left join rb_customer_hotelorderroom r on d.Id = r.DetailId

REBORN.Repository/Dmc/RB_Customer_TicketOrderRepository.cs

@@ -169,6 +169,17 @@ where {where} order by o.OrderId desc";
             {
                 where += $" and o.{nameof(RB_Customer_TicketOrder_Extend.UseDate)} <='{demodel.UseETime} 23:59:59'";
             }
+            if (demodel.IsFinish > 0)
+            {
+                if (demodel.IsFinish == 1)
+                {
+                    where += $@" AND o.{nameof(RB_Customer_TicketOrder_Extend.IsFinish)}= 1";
+                }
+                else
+                {
+                    where += $@" AND o.{nameof(RB_Customer_TicketOrder_Extend.IsFinish)}<> 1";
+                }
+            }
             if (demodel.OrderStatus > 0)
             {
                 where += $" and o.{nameof(RB_Customer_TicketOrder_Extend.OrderStatus)} ={(int)demodel.OrderStatus}";

REBORN.Repository/Dmc/RB_Travel_OrderRepository.cs

@@ -687,6 +687,16 @@ IFNULL(a.PreferTipAmount,0)-  IFNULL(a.CompensationMoney,0) + (IFNULL(A.PreferPr
             {
                 where += " AND B.OutBranchId NOT IN(1220,1218,1252) ";
             }
+            if (model.IsFinish > 0) {
+                if (model.IsFinish == 1)
+                {
+                    where += " and B.Status=2";
+                }
+                else {
+                    where += " and B.Status<>2";
+                }
+            }
+
             string sql;
             if (model.LossType == 1)
             {
@@ -1653,6 +1663,17 @@ left join rb_lineteam E on E.LtID=C.LineteamId
                     where += $@" AND  A.{nameof(RB_Travel_Order.Income)}>0";
                 }
             }
+            if (model.IsFinish > 0)
+            {
+                if (model.IsFinish == 1)
+                {
+                    where += " and B.Status=2";
+                }
+                else
+                {
+                    where += " and B.Status<>2";
+                }
+            }
             if (userInfo==null)
             {
                 userInfo = new UserInfo();

REBORN.Services.SellService/CustomerOrderService.cs

@@ -1578,6 +1578,7 @@ namespace REBORN.Services.SellService
                 CouponsName = parms.GetStringValue("CouponsName"),
                 IsSelectSale = parms.GetInt("IsSelectSale"),
                 EnterID = parms.GetInt("EnterID"),
+                IsFinish = parms.GetInt("IsFinish"),
                 Mobile = parms.GetStringValue("ContactNumber"),
             };
             if (userInfo.SimpleEasy == 1)