|
@@ -26,7 +26,7 @@ namespace XYY.Api.Order.Controllers.FBA
|
|
|
public FBAOrderController(IFBAOrderService orderService, IMoreThanOneTicketService moreThanOneTicketService)
|
|
|
{
|
|
|
this.orderService = orderService;
|
|
|
- this._moreThanOneTicketService= moreThanOneTicketService;
|
|
|
+ this._moreThanOneTicketService = moreThanOneTicketService;
|
|
|
}
|
|
|
#region 空派收件
|
|
|
|
|
@@ -105,7 +105,7 @@ namespace XYY.Api.Order.Controllers.FBA
|
|
|
#region 小包转大货逻辑
|
|
|
public async Task<IActionResult> SmallToLarge(List<int> orderIds)
|
|
|
{
|
|
|
- var result=await orderService.SmallToLarge(orderIds);
|
|
|
+ var result = await orderService.SmallToLarge(orderIds);
|
|
|
return Ok(result);
|
|
|
}
|
|
|
#endregion
|
|
@@ -371,6 +371,12 @@ namespace XYY.Api.Order.Controllers.FBA
|
|
|
await orderService.CalculateSettlementPrice(Ids);
|
|
|
return Ok();
|
|
|
}
|
|
|
+
|
|
|
+ public async Task<IActionResult> returnIncome(List<int> Ids)
|
|
|
+ {
|
|
|
+ await orderService.returnIncome(Ids);
|
|
|
+ return Ok();
|
|
|
+ }
|
|
|
#endregion
|
|
|
|
|
|
public async Task<IActionResult> SaveCustomerConfirm(View_Order_CustomerConfirm View_Order_CustomerConfirm)
|
|
@@ -411,10 +417,10 @@ namespace XYY.Api.Order.Controllers.FBA
|
|
|
#region fba快递业务
|
|
|
public async Task<IActionResult> GetFbaExpressSetting(int ChannelId)
|
|
|
{
|
|
|
- var data=await _moreThanOneTicketService.GetFbaExpressSetting(ChannelId);
|
|
|
+ var data = await _moreThanOneTicketService.GetFbaExpressSetting(ChannelId);
|
|
|
return Ok(data);
|
|
|
}
|
|
|
- public async Task<IActionResult> AddOrEditFbaExpressSetting(Logistics_FbaExpressSetting setting)
|
|
|
+ public async Task<IActionResult> AddOrEditFbaExpressSetting(Logistics_FbaExpressSetting setting)
|
|
|
{
|
|
|
return Ok(await _moreThanOneTicketService.AddOrEditFbaExpressSetting(setting));
|
|
|
}
|