1

Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs

@@ -179,8 +179,8 @@ namespace MyCode.Project.Services.Implementation
             requestBizData.ShopIds = null; // new long[] { 378761130654261100, 378761130654261100 };
             List<int> TradeTypeList = new List<int>();
             TradeTypeList.Add(1005);
-           
-            List<TradesItem> trades = new List<TradesItem>();
+            List<TradesItem> reslut = new List<TradesItem>();
+            List<ReturnChangeListResp> trades = new List<ReturnChangeListResp>();
             TradeTypeList.ForEach(ty =>
             {
                 requestBizData.ProcessStatusList = ty.ToString();
@@ -200,9 +200,9 @@ namespace MyCode.Project.Services.Implementation
                     int TotalResults = list1.data.TotalResults;
                     while (requestBizData.PageIndex* requestBizData.PageSize< TotalResults)
                     {
-                        //list1.data.trades.ForEach(h => h.TradeType = ty);
+                        //list1.data.returnChangeList.ForEach(h => h.TradeType = ty);
 
-                        //trades.AddRange(list1.data.trades);
+                        trades.AddRange(list1.data.returnChangeList);
                         requestBizData.PageIndex = pageIndex;
                         pageIndex++;
                         Thread.Sleep(100);
@@ -222,8 +222,46 @@ namespace MyCode.Project.Services.Implementation
                 }
             });
             var shocodes = shopConfigs.Select(t => t.FSHOPCODE).ToList();
-            trades = trades.Where(t => shocodes.Contains(t.shopCode)).ToList();
-            return trades;
+            trades = trades.Where(t => shocodes.Contains(t.ShopCode)).ToList();
+            //reslut = trades.Select(t => new TradesItem { tradeId = t.TradeId, couponFee = 0, realFee = 0, shopCode = t.ShopCode ,orderNo=t.ReturnChangeNo, tradeNo =t.TradeNo
+            //,isDelete=0, mainPostid=t.MainPostid,
+            //    companyName=t.CompanyName,
+            //    flagNames=t.FlagNames,
+            //    shopName=t.ShopName,
+            //    warehouseName=t.WarehouseName
+            //}).ToList();
+
+
+
+            reslut = trades.Select(rc => new TradesItem
+            {
+                tradeId = rc.TradeId,
+                couponFee = 0,
+                realFee = 0,
+                shopCode = rc.ShopCode,
+                orderNo = rc.ReturnChangeNo,
+                tradeNo = rc.TradeNo,
+                isDelete = 0,
+                mainPostid = rc.MainPostid,
+                companyName = rc.CompanyName,
+                flagNames = rc.FlagNames,
+                shopName = rc.ShopName,
+                warehouseName = rc.WarehouseName,
+                warehouseCode = rc.WarehouseCode,
+                logisticName = rc.LogisticName,
+                shopId = rc.ShopId.ToString(),
+                TradeType = 8, // 假设这是售后发货类型
+                consignTime = !string.IsNullOrWhiteSpace(rc.ConsignTime) ? (DateTime?)DateTime.Parse(rc.ConsignTime) : null,
+                payTime = null, // 可根据需要设置
+                tradeStatus = int.Parse(rc.TradeAfterStatus), // 注意类型转换
+                warehouseId = rc.WarehouseId.ToString(),
+                shopTypeCode = "",
+                apiType = -114, // 默认值
+                ReturnChangeGoodsDetail = rc.ReturnChangeGoodsDetail
+            }).ToList();
+
+          
+            return reslut;
         }
         #endregion
     }

Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs

@@ -190,7 +190,7 @@ namespace MyCode.Project.Services.Implementation
         {
             DateTime runTime = DateTime.Parse(now);
             var list = _jackYunService.GetReturnChangeList(runTime);
-            //SetOrder(list);
+            SetOrder(list);
             //_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
         }
         #endregion