|
@@ -4801,12 +4801,15 @@ public class OrderController : BaseController
|
|
|
//}
|
|
|
|
|
|
var reTransactNum = order.ReTransactNum.HasValue ? order.ReTransactNum.Value + 1 : 1;
|
|
|
- var orderStart = EOrderStatus.SendBack;
|
|
|
- if (_appOptions.Value.IsZiGong)
|
|
|
+ var orderStatus = EOrderStatus.SendBack;
|
|
|
+ var orderStartStatus = EOrderStatus.BackToUnAccept;
|
|
|
+
|
|
|
+ if (_appOptions.Value.IsZiGong)
|
|
|
{
|
|
|
- orderStart = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.SendBack : EOrderStatus.Special;
|
|
|
+ orderStatus = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.SendBack : EOrderStatus.Special;
|
|
|
+ orderStartStatus = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.BackToUnAccept : EOrderStatus.SpecialToUnAccept;
|
|
|
}
|
|
|
- var Status = model.StepType == EStepType.Start ? EOrderStatus.BackToUnAccept : orderStart;
|
|
|
+ var Status = model.StepType == EStepType.Start ? orderStartStatus : orderStatus;
|
|
|
await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ProcessType = processType, ReTransactNum = reTransactNum, Status = Status }).Where(o => o.Id == order.Id)
|
|
|
.ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
|
|