diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
index b8add60..c47fa92 100644
--- a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
@@ -110,11 +110,11 @@ namespace MyCode.Project.Infrastructure.JackYun
         /// <summary>
         /// 
         /// </summary>
-        public int couponFee { get; set; }
+        public decimal couponFee { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int realFee { get; set; }
+        public decimal realFee { get; set; }
         /// <summary>
         /// 店铺编码
         /// </summary>
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
index 39f4c64..9ab9f4d 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs
@@ -88,7 +88,7 @@ namespace MyCode.Project.Services.Implementation
             //requestBizData.TradeStatus = 1010;
             requestBizData.TradeType = 1;
             requestBizData.SourceTradeNos = "";
-            requestBizData.ShopIds =  shopConfigs.Select(t => t.FSHOPCODE).ToList(); // new long[] { 378761130654261100, 378761130654261100 };
+            requestBizData.ShopIds = null; // new long[] { 378761130654261100, 378761130654261100 };
             List<int> TradeTypeList = new List<int>();
             TradeTypeList.Add(1);
             TradeTypeList.Add(7);
@@ -107,6 +107,8 @@ namespace MyCode.Project.Services.Implementation
                     {
                         var orderjson = JsonHelper.ToJson(response.result);
                         var list1 = JsonHelper.ToObject<TradeFullinfogetResp>(orderjson);
+                      
+
                         int pageIndex = 1;
                         while (list1.data.trades != null && list1.data.trades.Count > 0)
                         {
@@ -121,6 +123,7 @@ namespace MyCode.Project.Services.Implementation
                             {
                                 orderjson = JsonHelper.ToJson(response.result);
                                 list1 = JsonHelper.ToObject<TradeFullinfogetResp>(orderjson);
+                           
                             }
                         }
                     }
@@ -130,6 +133,8 @@ namespace MyCode.Project.Services.Implementation
                         throw new BaseException(msg);
                     }
                 });
+            var shocodes = shopConfigs.Select(t => t.FSHOPCODE).ToList();
+            trades = trades.Where(t => shocodes.Contains(t.shopCode)).ToList();
             return trades;
         }
         #endregion
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
index 5958939..25ed0bc 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
@@ -6,10 +6,12 @@ using MyCode.Project.Infrastructure.Common;
 using MyCode.Project.Infrastructure.JackYun;
 using MyCode.Project.Repositories;
 using MyCode.Project.Repositories.Common;
+using MyCode.Project.Services.IServices;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace MyCode.Project.Services.Implementation
@@ -168,6 +170,11 @@ namespace MyCode.Project.Services.Implementation
                 _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);
         }
diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
index b05aafa..89fdd2c 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
@@ -54,118 +54,7 @@ namespace MyCode.Project.Services.Implementation
             _workProcessService = workProcessService;
         }
 
-
-        #region SetOrder(把吉客云订单存进本地数据库)
-        /// <summary>
-        /// 把吉客云订单存进本地数据库
-        /// </summary>
-        /// <param name="trades"></param>
-        [TransactionCallHandler]
-        public void SetOrder(List<TradesItem> trades)
-        {
-            var ids = trades.Select(t => t.tradeId).Distinct().ToList();
-            ids = _jackOrdersRepository.Queryable().Where(t => ids.Contains(t.TradeId)).Select(t => t.TradeId).Distinct().ToList();
-            if (ids.Count > 0)
-                trades = trades.Where(t => !ids.Contains(t.tradeId)).ToList();
-            List<JackOrders> jackOrdersList = new List<JackOrders>();
-            List<JackOrdersItem> ordersItemList = new List<JackOrdersItem>();
-            trades.ForEach(t =>
-             {
-                 JackOrders jackOrders = new JackOrders();
-                 jackOrders = AutoMapperHelper.AutoMappToSingle<JackOrders, TradesItem>(t);
-                 jackOrders.Id = Guid.NewGuid();
-                 jackOrders.Status = 0;
-                 jackOrders.UpdateTime = DateTime.Now;
-                 jackOrders.CreateTime = DateTime.Now;
-                 if (t.goodsDetail != null)
-                 {
-                     var items = AutoMapperHelper.AutoMappToList<JackOrdersItem, GoodsDetailItem>(t.goodsDetail);
-                     items.ForEach(k =>
-                     {
-                         k.JackOrdersId = jackOrders.Id;
-                     });
-                     jackOrdersList.Add(jackOrders);
-                     ordersItemList.AddRange(items);
-                 }
-
-             });
-
-            if (jackOrdersList.Count > 0)
-            {
-                _jackOrdersRepository.Add(jackOrdersList);
-                _jackOrdersItemRepository.Add(ordersItemList);
-            }
-        }
-        #endregion
-
-        #region GetAndMergeJackYunOrder(合并吉客云订单到新表)
-        /// <summary>
-        /// 合并吉客云订单到新表
-        /// </summary>
-        /// <returns></returns>
-        [TransactionCallHandler]
-        public string GetAndMergeJackYunOrder(string now)
-        {
-            var list = _jackOrdersItemRepository.GetPushOrder();
-            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).Count() > 0)
-                {
-                    return;
-                }
-                PushKingDeeOrder pushKingDeeOrder = new PushKingDeeOrder();
-                pushKingDeeOrder = AutoMapperHelper.AutoMappToSingle<PushKingDeeOrder, PushOrderListResp>(sheet);
-                pushKingDeeOrder.Id = Guid.NewGuid();
-                pushKingDeeOrders.Add(pushKingDeeOrder);
-
-                var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).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
-
+         
         public string PushOrderToKingDee(string id)
         {
             string result2 = "";
diff --git a/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs b/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs
index d63a731..e480bb1 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs
@@ -180,6 +180,7 @@ namespace MyCode.Project.Services.Implementation
             process.FuncStatus = (int)WorkProcessStatus.Complete;
             process.ExecuteTime = DateTime.Now;
             process.ExceptionInfo = string.Empty;
+            process.EditTime = DateTime.Now;             
             process.Result=JsonHelper.ToJson(result);
             _SysWorkProcessRepository.Update(process);