|
@@ -3993,7 +3993,8 @@ public class OrderController : BaseController
|
|
|
var pushTypes = dto.OrderPushTypes.Select(x => x.PushType);
|
|
|
order.PushType = string.Join(",", pushTypes);
|
|
|
}
|
|
|
- if (dto.Tags != null && dto.Tags.Any())
|
|
|
+ order.OrderTags = new List<SystemDicData>();
|
|
|
+ if (dto.Tags != null && dto.Tags.Any())
|
|
|
{
|
|
|
var orderTags = new List<SystemDicData>();
|
|
|
foreach (var item in dto.Tags)
|
|
@@ -6020,7 +6021,7 @@ public class OrderController : BaseController
|
|
|
// await _orderPublishRepository.RemoveAsync(publish, false, HttpContext.RequestAborted);
|
|
|
//}
|
|
|
|
|
|
- var reTransactNum = order.ReTransactNum.HasValue ? order.ReTransactNum.Value + 1 : 1;
|
|
|
+ //var reTransactNum = order.ReTransactNum.HasValue ? order.ReTransactNum.Value + 1 : 1;
|
|
|
var orderStatus = EOrderStatus.SendBack;
|
|
|
var orderStartStatus = EOrderStatus.BackToUnAccept;
|
|
|
|
|
@@ -6029,10 +6030,10 @@ public class OrderController : BaseController
|
|
|
orderStatus = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.SendBack : EOrderStatus.Special;
|
|
|
orderStartStatus = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.BackToUnAccept : EOrderStatus.SpecialToUnAccept;
|
|
|
}
|
|
|
-
|
|
|
+ //ReTransactNum = reTransactNum,
|
|
|
var Status = model.StepType == EStepType.Start ? orderStartStatus : orderStatus;
|
|
|
await _orderRepository.Updateable()
|
|
|
- .SetColumns(o => new Orders.Order() { ProcessType = processType, ReTransactNum = reTransactNum, Status = Status })
|
|
|
+ .SetColumns(o => new Orders.Order() { ProcessType = processType, Status = Status })
|
|
|
.Where(o => o.Id == order.Id)
|
|
|
.ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
|
|