11

REBORN.Module.SellModule/SellOrderModule.cs

@@ -20117,24 +20117,10 @@ namespace REBORN.Module.SellModule
         /// 获取跟团游订单统计
         /// </summary>
         /// <param name="model"></param>
-        /// <param name="lineIdStr">默认查询线路字符串</param>
-        /// <param name="isGetLeader">是否查询领队(true查询，false不查询)</param>
-        /// <param name="isGetSetNum">是否机位(true查询，false不查询)</param>
         /// <returns></returns>
-        public RB_Travel_Order_Extend GetTravelOrderListStatisticsModule(RB_Travel_Order_Extend model, string lineIdStr = "", bool isGetLeader = true, bool isGetSetNum = false)
+        public RB_Travel_Order_Extend GetTravelOrderListStatisticsModule(RB_Travel_Order_Extend model)
         {
-            var smodel = orderRepository.GetTravelOrderListStatisticsRepository(model, lineIdStr, isGetLeader);
-            // HK 2019-05-14新增机位统计
-            if (isGetSetNum)
-            {
-                var extModel = orderRepository.GetTravelOrderListStatisticsSeatRepository(lineIdStr, model);
-                smodel.FSeat = extModel.FSeat;
-                smodel.YSeat = extModel.YSeat;
-                smodel.CSeat = extModel.CSeat;
-                smodel.SurplusCSeat = extModel.SurplusCSeat;
-                smodel.SurplusFSeat = extModel.SurplusFSeat;
-                smodel.SurplusYSeat = extModel.SurplusYSeat;
-            }
+            var smodel = orderRepository.GetTravelOrderListStatisticsRepository(model);
             return smodel;
         }
  

REBORN.Repository/Dmc/RB_Travel_OrderRepository.cs

@@ -61,7 +61,7 @@ FROM rb_travel_order AS A LEFT JOIN rb_travel_price as B ON A.TCID=B.TCID
      LEFT JOIN rb_lineteam AS E on E.LtID=C.LineteamId
 	 LEFT JOIN rb_travel_orderspecialoffer as os on os.OrderId=a.OrderId
      LEFT JOIN (SELECT ogh.OrderId,SUM(case when IFNULL(ogh.ID,0)>0 THEN 1 ELSE 0 END) AS Num FROM rb_travel_orderguesthouse ogh GROUP BY ogh.OrderId) t ON A.OrderId=t.OrderId
-WHERE 1=1 AND IFNULL(B.TeamType,0)=0
+WHERE 1=1 AND B.TeamType=0
 ");
             builder.AppendFormat(" AND B.RB_Group_Id={0} ", model.RB_Group_Id);
             if (!string.IsNullOrEmpty(lineIdStr))
@@ -1577,7 +1577,7 @@ LEFT JOIN rb_travel_config AS C ON c.ID=B.ConfigID  {where} ";
         /// <returns></returns>
         public RB_Travel_Order_Extend GetTravelOrderListStatistics(RB_Travel_Order_Extend model, string lineIdStr = "", bool isGetLeader = true, int isNormal = 0)
         {
-            string where = $@" where 1=1 and B.RB_Group_Id={model.RB_Group_Id} ";
+            string where = $@" where 1=1 and B.RB_Group_Id={model.RB_Group_Id} AND IFNULL(B.TeamType,0)=0  ";
             if (!string.IsNullOrEmpty(lineIdStr))
             {
                 where += string.Format(@" AND C.LineId IN({0})", lineIdStr);
@@ -2043,32 +2043,21 @@ left join rb_lineteam E on E.LtID=C.LineteamId
         /// 获取跟团游订单统计
         /// </summary>
         /// <param name="model"></param>
-        /// <param name="lineIdStr">默认查询线路字符串</param>
-        /// <param name="isGetLeader">是否查询领队(true查询，false不查询)</param>
         /// <returns></returns>
-        public RB_Travel_Order_Extend GetTravelOrderListStatisticsRepository(RB_Travel_Order_Extend model, string lineIdStr = "", bool isGetLeader = true)
+        public RB_Travel_Order_Extend GetTravelOrderListStatisticsRepository(RB_Travel_Order_Extend model)
         {
-            string where = $@" where 1=1 and B.RB_Group_Id={model.RB_Group_Id} ";
+            string where = $@" where 1=1 and B.RB_Group_Id={model.RB_Group_Id} AND IFNULL(A.IsLeaderOrder,0)=0 ";
             where += " AND B.TeamType=" + (int)TeamTypeEnum.Normal;
-            if (!string.IsNullOrEmpty(lineIdStr))
-            {
-                where += string.Format(@" AND C.LineId IN({0})", lineIdStr);
-            }
-
             if (model.IsAirTicket == 1)//只查机票订单
             {
                 where += $@" AND  A.{nameof(RB_Travel_Order.GroupType)} = {(int)OrderJoinType.SingleAirTicket}";
             }
             else if (model.IsAirTicket == 2)
-            {//排除机票订单
-                where += $@" AND  A.{nameof(RB_Travel_Order.GroupType)} != {(int)OrderJoinType.SingleAirTicket}";
-            }
-
-            //是否查询领队
-            if (!isGetLeader)
             {
-                where += string.Format(@" AND IFNULL(A.IsLeaderOrder,0)=0 ");
+                //排除机票订单
+                where += $@" AND  A.{nameof(RB_Travel_Order.GroupType)} != {(int)OrderJoinType.SingleAirTicket}";
             }
+ 
             if (model.LineId > 0)
             {
                 where += $@" AND C.LineId={model.LineId}";
@@ -2289,7 +2278,7 @@ WHERE 1=1 AND B.Status<>4 AND B.TCState IN(3) AND B.TeamType={0} ", (int)TeamTyp
             builder.AppendFormat(@"
 SELECT SUM(IFNULL(B.FSeat,0)) AS FSeat,SUM(IFNULL(B.YSeat,0)) AS YSeat, SUM(IFNULL(B.CSeat,0)) AS CSeat ,SUM(IFNULL(B.SurplusFSeat,0)) AS SurplusFSeat,SUM(IFNULL(B.SurplusYSeat,0)) AS SurplusYSeat, SUM(IFNULL(B.SurplusCSeat,0)) AS SurplusCSeat
 FROM rb_travel_price AS B LEFT JOIN rb_travel_config AS C ON c.ID=B.ConfigID
-WHERE 1=1 AND B.Status<>4 AND B.TCState IN(3) ");
+WHERE 1=1 AND B.Status<>4 AND B.TCState IN(3) AND IFNULL(B.TeamType,0)=0 ");
             if (query.QStartDate != null && !string.IsNullOrEmpty(query.QStartDate.ToString()))
             {
                 builder.AppendFormat(" AND B.StartDate>='{0}' ", query.QStartDate);

REBORN.Services.SellService/SellOrderService.cs

@@ -11994,7 +11994,6 @@ namespace REBORN.Services.SellService
                 model.RedEnvelopeMoney,
                 PreferTipAmount = model.PreferTipAmount ?? 0,
                 CompensationMoney = model.CompensationMoney ?? 0,
-                // DueinMoney = (model.DueinMoney ?? 0) - (model.ZaiTu ?? 0) ,2023-04-18 update by:w 代收里面包含未收款的小费
                 DueinMoney = (model.DueinMoney ?? 0) - (model.ZaiTu ?? 0) + ((model.PreferTipAmount ?? 0) - (model.CompensationMoney ?? 0)),
                 model.Commission,
                 model.InteriorNum,