From 71f1368e6bdf7d9c996e459bc00c7c967a022292 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Sat, 18 Oct 2025 15:05:26 +0800 Subject: [PATCH] 1 --- .../Repositories/IJackOrdersItemRepository.cs | 6 ++ .../IServices/IJackYunTaskService.cs | 7 ++ .../Implementation/JackYunService.cs | 6 +- .../Implementation/JackYunTaskService.cs | 73 +++++++++++++++++++ .../Implementation/OrderPushService.cs | 4 +- .../Controllers/TestController.cs | 12 +++ 6 files changed, 103 insertions(+), 5 deletions(-) diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersItemRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersItemRepository.cs index 3160d0d..a74c9e5 100644 --- a/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersItemRepository.cs +++ b/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersItemRepository.cs @@ -20,5 +20,11 @@ namespace MyCode.Project.Domain.Repositories /// List GetPushOrder(); + /// + /// 获取合并后的吉客云订单 + /// + /// + List GetPushReturnOrder(); + } } diff --git a/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs b/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs index 8cd7bcf..bcfc2c7 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs @@ -32,5 +32,12 @@ namespace MyCode.Project.Services /// void SetReturnOrder(List trades); + + /// + /// 合并吉客云退货订单到新表 + /// + /// + + string GetAndMergeJackReturnYunOrder(string now); } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs index e69ce1b..e852d27 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs @@ -155,9 +155,9 @@ namespace MyCode.Project.Services.Implementation ReturnChangeGetRequestBizData requestBizData = new ReturnChangeGetRequestBizData(); //string value = "2025-06-15 00:00:00";// DateTime.Now.Date.AddDays(-5).ToString("yyyy-MM-dd HH:mm:ss") ; //string value1 = "2025-06-20 00:00:00";//DateTime.Now.Date.ToString("yyyy-MM-dd HH:mm:ss"); - string value = now.Date.AddDays(-7).ToString("yyyy-MM-dd"); + string value = now.Date.AddDays(-1).ToString("yyyy-MM-dd"); string value1 = now.Date.ToString("yyyy-MM-dd"); - if (now.Date.AddDays(-7) < startTime) + if (now.Date.AddDays(-1) < startTime) { value = startTime.ToString("yyyy-MM-dd"); } @@ -251,7 +251,7 @@ namespace MyCode.Project.Services.Implementation logisticName = rc.LogisticName, shopId = rc.ShopId.ToString(), TradeType = 8, // 假设这是售后退货类型 - consignTime = !string.IsNullOrWhiteSpace(rc.ConsignTime) ? (DateTime?)DateTime.Parse(rc.ConsignTime) : null, + consignTime = !string.IsNullOrWhiteSpace(rc.DeliveryTime) ? (DateTime?)DateTime.Parse(rc.DeliveryTime) : null, payTime = null, // 可根据需要设置 tradeStatus = int.Parse(rc.TradeAfterStatus), // 注意类型转换 warehouseId = rc.WarehouseId.ToString(), diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs index fc71405..e5d3ff4 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs @@ -246,5 +246,78 @@ namespace MyCode.Project.Services.Implementation } #endregion + + + #region GetAndMergeJackReturnYunOrder(合并吉客云退货订单到新表) + /// + /// 合并吉客云退货订单到新表 + /// + /// + [TransactionCallHandler] + public string GetAndMergeJackReturnYunOrder(string now) + { + var list = _jackOrdersItemRepository.GetPushReturnOrder(); + List mesg = new List(); + + var shopParemList = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList(); + List pushKingDeeOrderItems = new List(); + List pushKingDeeOrders = new List(); + list.ForEach(sheet => + { + if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId + && t.ConsignTime.Value.ToString("yyyy-MM-dd") == sheet.ConsignTime).Count() > 0) + { + return; + } + PushKingDeeOrder pushKingDeeOrder = new PushKingDeeOrder(); + pushKingDeeOrder = AutoMapperHelper.AutoMappToSingle(sheet); + pushKingDeeOrder.Id = Guid.NewGuid(); + pushKingDeeOrder.CreateTime = DateTime.Now; + pushKingDeeOrder.UpdateTime = DateTime.Now; + pushKingDeeOrders.Add(pushKingDeeOrder); + + var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId && sheet.ConsignTime == t.ConsignTime).ToList(); + tempList.ForEach(item => + { + PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem(); + pushKingDeeOrderItem = AutoMapperHelper.AutoMappToSingle(item); + pushKingDeeOrderItem.PushKingDeeOrderId = pushKingDeeOrder.Id; + pushKingDeeOrderItem.Id = Guid.NewGuid(); + pushKingDeeOrderItems.Add(pushKingDeeOrderItem); + }); + //var shopParem = shopParemList.Where(h => h.FSHOPCODE == sheet.ShopId.Value.ToString()&& h.FWAREHOUSE.Value.ToString()==sheet.WarehouseId ).FirstOrDefault(); + //if (shopParem != null) + //{ + //} + //else + //{ + // mesg.Add($@"店铺{sheet.ShopName}没有配置店铺参数或者配置的仓库不是 {sheet.WarehouseCode}"); + //} + }); + if (pushKingDeeOrders.Count > 0) + { + var oldList = _jackOrdersRepository.Queryable().Where(t => t.Status == 0).ToList(); + oldList.ForEach(t => + { + if (pushKingDeeOrders.Count(h => h.ShopId == t.ShopId && t.WarehouseId == h.WarehouseId) > 0) + { + t.Status = 1; + t.UpdateTime = DateTime.Now; + } + }); + oldList = oldList.Where(t => t.Status == 1).ToList(); + _jackOrdersRepository.Update(oldList); + _pushKingDeeOrderRepository.Add(pushKingDeeOrders); + _pushKingDeeOrderItemRepository.Add(pushKingDeeOrderItems); + } + pushKingDeeOrders.ForEach(t => + { + _workProcessService.Add(this.MerchantId, "PushOrderToKingDee", "推送退货订单到云星空或者WMS", t.Id, 1); + Thread.Sleep(300); + }); + + return JsonHelper.ToJson(list); + } + #endregion } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs index ad8475b..89fed74 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs @@ -143,8 +143,8 @@ namespace MyCode.Project.Services.Implementation CustomerId = param.FCANGKUHUOZHU, // 货主ID Sku = n.Barcode, Barcode = n.Barcode, - OrderQty = n.SellCount, - OrderPrice = Math.Round(n.DivideSellTotal / n.SellCount, 10), + OrderQty =Math.Abs( n.SellCount), + OrderPrice = Math.Abs( Math.Round(n.DivideSellTotal /(n.SellCount), 10)), ItemId = n.GoodsNo, // 商品 LocationId = param.FWAREHOUSECODE, CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs index 1dcad28..93dba13 100644 --- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs +++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs @@ -91,6 +91,18 @@ namespace MyCode.Project.WebApi.Controllers } #endregion + #region 合并吉客云退货订单到新表 + /// + /// 合并吉客云退货订单到新表 + /// + [HttpGet] + [AllowAnonymous] + public string GetAndMergeJackReturnYunOrder(string now) + { + return _jackYunTaskService.GetAndMergeJackReturnYunOrder(now); + } + #endregion + //#region 订单查询