1

2025-10-18 15:05:26 +08:00
parent 316e78f4f2
commit 71f1368e6b
6 changed files with 103 additions and 5 deletions
--- 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(合并吉客云退货订单到新表)
+        /// <summary>
+        /// 合并吉客云退货订单到新表
+        /// </summary>
+        /// <returns></returns>
+        [TransactionCallHandler]
+        public string GetAndMergeJackReturnYunOrder(string now)
+        {
+            var list = _jackOrdersItemRepository.GetPushReturnOrder();
+            List<string> mesg = new List<string>();
+
+            var shopParemList = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList();
+            List<PushKingDeeOrderItem> pushKingDeeOrderItems = new List<PushKingDeeOrderItem>();
+            List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
+            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<PushKingDeeOrder, PushOrderListResp>(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<PushKingDeeOrderItem, PushOrderListResp>(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<IOrderPushService>(this.MerchantId, "PushOrderToKingDee", "推送退货订单到云星空或者WMS", t.Id, 1);
+                Thread.Sleep(300);
+            });
+
+            return JsonHelper.ToJson(list);
+        }
+        #endregion
    }
 }