1

REBORN.Module.CommissionModule/MergeCommissionModule2.cs

@@ -2687,6 +2687,7 @@ namespace REBORN.Module.CommissionModule
                             case Common.Enum.Dmc.CRMMergeOrderTypeEnum.Air:
                                 keyValues = new Dictionary<string, object>() {
                                     { nameof(Model.Extend.Sell.RB_CRMTicket_Order_Extend.SellCommission), Commission},
+                                    { nameof(Model.Extend.Sell.RB_CRMTicket_Order_Extend.IsSendCommission), 1},
                                 };
                                 crmTicket_OrderRepository.Update(keyValues, new WhereHelper(nameof(Model.Extend.Sell.RB_CRMTicket_Order_Extend.OrderId), item.OrderId));
                                 break;

REBORN.Repository/Sell/RB_CRMTicket_OrderRepository.cs

@@ -171,7 +171,7 @@ ORDER BY t.CreateTime DESC";
         {
             string sql = $@"SELECT o.* FROM rb_ticket_order o
 WHERE o.GroupId ={rB_Group_id} and o.OrderStatus <>2 and o.Money >0 {(SaleId>0? " and o.CreateBy=" + SaleId : "")}
-and ((o.DepartTime>='{startTime}' and o.DepartTime <='{endTime} 23:59:59') or (o.OrderStatus=6 and o.LossFinishTime>='{startTime}' and o.LossFinishTime<='{endTime} 23:59:59'))";
+and o.IsSendCommission <>1 and o.OrderStatus in(5,6) ";
             return Get<RB_CRMTicket_Order_Extend>(sql).ToList();
         }