From 4766ddf18c7f02deaecd8850267aa01ca45e4e61 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Mon, 20 Oct 2025 16:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=B1=BB=E5=9E=8B=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JackOrdersItemRepository.cs | 6 +++--- .../Implementation/JackYunService.cs | 8 ++++---- .../Implementation/JackYunTaskService.cs | 6 +++--- .../MyCode.Project.Services/Implementation/WMSService.cs | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs index 96fdcee..c11fd25 100644 --- a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs @@ -35,7 +35,7 @@ namespace MyCode.Project.Repositories FROM [JackOrders] a WITH (NOLOCK) LEFT JOIN [dbo].[JackOrdersItem] b WITH (NOLOCK) ON a.id = b.JackOrdersId -WHERE a.status = 0 and TradeType in (1,7) +WHERE a.status = 0 and TradeType in (1,7) and sellCount <> 0 GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [status], CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo], [goodsId], [barcode] ,[warehouseId], [TradeType],Unit"; var list = this.SelectList(sql); return list; @@ -54,12 +54,12 @@ GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [s SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode], [status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime], [goodsNo], [goodsId],SUM([sellTotal]*-1) [sellTotal], - SUM([sellCount]*-1) [sellCount], SUM([ShareShouldReturnFee]*-1) AS [divideSellTotal], + SUM([returnCount]*-1) [sellCount], SUM([ShareShouldReturnFee]*-1) AS [divideSellTotal], [barcode], [TradeType] ,[warehouseId],Unit FROM [JackOrders] a WITH (NOLOCK) LEFT JOIN [dbo].[ReturnChangeGoodsDetail] b WITH (NOLOCK) ON a.id = b.JackOrdersId -WHERE a.status = 0 and [TradeType]=8 +WHERE a.status = 0 and [TradeType]=8 and returnCount <> 0 GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [status], CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo], [goodsId], [barcode] ,[warehouseId], [TradeType],Unit ORDER BY [shopCode],[consignTime] desc,[TradeType] diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs index e852d27..4210e4d 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(-1).ToString("yyyy-MM-dd"); + string value = now.Date.AddDays(-7).ToString("yyyy-MM-dd"); string value1 = now.Date.ToString("yyyy-MM-dd"); - if (now.Date.AddDays(-1) < startTime) + if (now.Date.AddDays(-7) < startTime) { value = startTime.ToString("yyyy-MM-dd"); } @@ -183,7 +183,7 @@ namespace MyCode.Project.Services.Implementation List trades = new List(); TradeTypeList.ForEach(ty => { - requestBizData.ProcessStatusList = ty.ToString(); + requestBizData.ProcessStatusList = ""; string lggl = JsonHelper.ToJson(requestBizData); LogHelper.Info(lggl); JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.RETURNCHANGE).Value, "1.0", requestBizData); @@ -235,7 +235,7 @@ namespace MyCode.Project.Services.Implementation reslut = trades.Select(rc => new TradesItem { - tradeId = rc.TradeId, + tradeId = rc.TradeAfterId.ToString(), couponFee = 0, realFee = 0, shopCode = rc.ShopCode, diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs index e5d3ff4..d9033c0 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs @@ -125,7 +125,7 @@ namespace MyCode.Project.Services.Implementation 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) + && t.ConsignTime.Value.ToString("yyyy-MM-dd")==sheet.ConsignTime && t.TradeType != 8).Count() > 0) { return; } @@ -191,7 +191,7 @@ namespace MyCode.Project.Services.Implementation DateTime runTime = DateTime.Parse(now); var list = _jackYunService.GetReturnChangeList(runTime); SetReturnOrder(list); - //_workProcessService.Add(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1); + _workProcessService.Add(this.MerchantId, "GetAndMergeJackReturnYunOrder", "合并吉客云退货订单到新表", now, 1); } #endregion @@ -265,7 +265,7 @@ namespace MyCode.Project.Services.Implementation 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) + && t.ConsignTime.Value.ToString("yyyy-MM-dd") == sheet.ConsignTime && t.TradeType==8).Count() > 0) { return; } diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs index c33e550..41052ca 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs @@ -44,6 +44,7 @@ namespace MyCode.Project.Services.Implementation DateTime now = DateTime.Now.Date; _workProcessService.Add(this.MerchantId, "GetList", "抓取WMS订单到本地数据库", now.AddDays(-3).ToString("yyyy-MM-dd"), 1); _workProcessService.Add(this.MerchantId, "TaskGetJackYunOrder", "调度运行抓吉客云销售订单", now.ToString("yyyy-MM-dd"), 1); + _workProcessService.Add(this.MerchantId, "TaskGetReturnChangeList", "调度运行抓吉客云退货订单", now.ToString("yyyy-MM-dd"), 1); } #endregion