Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline/Orders/OrderDomainService.cs

@@ -604,21 +604,16 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         if (schedulings > 0)
         {
             var sendNum = steps.Count / schedulings;
-            scheduling.SendOrderNum += sendNum;
-            if (!scheduling.LoginSendOrderNum.HasValue)
-            {
-                scheduling.LoginSendOrderNum = scheduling.LoginSendOrderNum.HasValue && scheduling.LoginSendOrderNum > sendNum ? scheduling.LoginSendOrderNum : sendNum;
-                await _schedulingRepository.Updateable()
-                    .SetColumns(s => new Scheduling() { LoginSendOrderNum = scheduling.LoginSendOrderNum })
-                    .Where(s => s.SchedulingTime == scheduling.SchedulingTime).ExecuteCommandAsync(cancellationToken);
-            }
-            sendNum = scheduling.LoginSendOrderNum.Value;
-            await _schedulingRepository.Updateable()
-                .SetColumns(s => new Scheduling() { SendOrderNum = scheduling.SendOrderNum, AtWork = scheduling.AtWork })
-                .Where(s => s.Id == scheduling.Id).ExecuteCommandAsync(cancellationToken);
-
-            if (sendNum <= 0) return;
-            var sendSteps = steps.Take(sendNum).ToList();
+			if (!scheduling.LoginSendOrderNum.HasValue)
+			{
+				scheduling.LoginSendOrderNum = scheduling.LoginSendOrderNum.HasValue && scheduling.LoginSendOrderNum > sendNum ? scheduling.LoginSendOrderNum : sendNum;
+			}
+			sendNum = scheduling.LoginSendOrderNum.Value;
+			if (sendNum <= 0) return;
+			var sendSteps = steps.Take(sendNum).ToList();
+			await _schedulingRepository.Updateable()
+				.SetColumns(s => new Scheduling() { AtWork = scheduling.AtWork, LoginSendOrderNum = scheduling.LoginSendOrderNum })
+				.Where(s => s.Id == scheduling.Id).ExecuteCommandAsync(cancellationToken);
             await _orderRepository.Updateable().SetColumns(o => new Order()
             {
                 CenterToOrgHandlerId = user.OrgId,