Browse Source

结算增加退回操作

lzk 1 week ago
parent
commit
7c2e072d73

+ 7 - 0
3.Service/XYY.Service.Standard.Order/FBA/FBAOrderService.cs

@@ -100,6 +100,7 @@ namespace XYY.Service.Standard.Order.FBA
         Task<bool> ModifyCreateOrderChannelId(MpsModifyCreateOrderChannelId mpsModify, UserContent user);
         Task<bool> CalculateSettlementPrice(IEnumerable<int> Ids);
         Task<bool> SmallToLarge(List<int> orderIds);
+        Task<bool> returnIncome(List<int> Ids);
     }
 
     public class FBAOrderService : IFBAOrderService
@@ -720,6 +721,12 @@ where Id in @Ids", 600, new { Ids = Ids });
             }
             return true;
         }
+        public async Task<bool> returnIncome(List<int> Ids)
+        {
+            string sql = "update Order_MpsOrder set Status=3  where OrderId in @Ids";
+            await _unitOfWork.ExecuteAsync(sql, new { Ids = Ids });
+            return true;
+        }
         public async Task<bool> AutoComputeSettlementInfo(IEnumerable<View_Order_CustomerConfirm> confirms)
         {
             List<int> channelIds = confirms.Select(x => x.CreateOrderChannelId).Distinct().ToList();

+ 10 - 4
5.Api/XYY.Api.Order/Controllers/FBA/FBAOrderController.cs

@@ -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));
         }