Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Server.API/Controllers/OrderController.cs

@@ -107,7 +107,7 @@ namespace BBWY.Server.API.Controllers
         /// </summary>
         /// <param name="relationPurchaseOrderRequestV2"></param>
         [HttpPost]
-        public void RelationPurchaseOrderV2([FromBody]RelationPurchaseOrderRequestV2 relationPurchaseOrderRequestV2)
+        public void RelationPurchaseOrderV2([FromBody] RelationPurchaseOrderRequestV2 relationPurchaseOrderRequestV2)
         {
             orderBusiness.RelationPurchaseOrderV2(relationPurchaseOrderRequestV2);
         }
@@ -142,6 +142,7 @@ namespace BBWY.Server.API.Controllers
             orderBusiness.SyncOrderByDate(syncOrderByDateRequest);
         }
 
+        /*
         /// <summary>
         /// 订单同步
         /// </summary>
@@ -151,6 +152,16 @@ namespace BBWY.Server.API.Controllers
         {
             Task.Factory.StartNew(() => orderBusiness.SyncOrder(shopId, string.Empty), System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler);
         }
+        */
+
+        /// <summary>
+        /// 同步所有店铺订单
+        /// </summary>
+        [HttpPost]
+        public void SyncAllShopOrder()
+        {
+            orderBusiness.SyncAllShopOrder();
+        }
 
         /// <summary>
         /// 订单同步

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -29,6 +29,7 @@ namespace BBWY.Server.Business
         private IIdGenerator idGenerator;
         private TaskSchedulerManager taskSchedulerManager;
         private MDSBusiness mdsBusiness;
+        private VenderBusiness venderBusiness;
         private Lazy<FreeSqlMultiDBManager> freeSqlMultiDBManagerLazy;
         private FreeSqlMultiDBManager freeSqlMultiDBManager => freeSqlMultiDBManagerLazy.Value;
 
@@ -39,6 +40,7 @@ namespace BBWY.Server.Business
                              IOptions<GlobalConfig> options,
                              TaskSchedulerManager taskSchedulerManager,
                              MDSBusiness mdsBusiness,
+                             VenderBusiness venderBusiness,
                              IServiceProvider serviceProvider) : base(restApiService, options)
         {
             this.logger = logger;
@@ -50,6 +52,7 @@ namespace BBWY.Server.Business
                 { Enums.Platform.京东, SyncJDOrder }
             };
             this.mdsBusiness = mdsBusiness;
+            this.venderBusiness = venderBusiness;
             freeSqlMultiDBManagerLazy = new Lazy<FreeSqlMultiDBManager>(() => serviceProvider.GetService<FreeSqlMultiDBManager>());
         }
 
@@ -982,11 +985,17 @@ namespace BBWY.Server.Business
         public void SyncOrder(long shopId, string orderId, DateTime? startTime = null, DateTime? endTime = null)
         {
             var shop = mdsBusiness.GetShopInfoByShopId(shopId);
+            SyncOrder(shop, orderId, startTime, endTime);
+        }
+
+        private void SyncOrder(ShopResponse shop, string orderId, DateTime? startTime = null, DateTime? endTime = null, bool isAuto = false)
+        {
             try
             {
+                logger.Info($"订单同步 {shop.ShopName} isAuto {isAuto}");
                 if (!syncOrderMethodDic.ContainsKey(shop.PlatformId))
                     throw new Exception("不支持的平台");
-
+                var shopId = long.Parse(shop.ShopId);
                 var relayAPIHost = GetPlatformRelayAPIHost(shop.PlatformId);
                 var orderListApiResult = restApiService.SendRequest(relayAPIHost, "api/PlatformSDK/GetOrderList", new SearchPlatformOrderRequest()
                 {
@@ -999,7 +1008,7 @@ namespace BBWY.Server.Business
                     PageSize = 100,
                     Platform = shop.PlatformId,
                     JDColType = string.IsNullOrEmpty(shop.ShopType) ? "0" : shop.ShopType,
-                    SaveResponseLog = true,
+                    //SaveResponseLog = true,
                     OrderId = orderId
                 }, null, HttpMethod.Post);
                 if (orderListApiResult.StatusCode != System.Net.HttpStatusCode.OK)
@@ -1511,5 +1520,17 @@ namespace BBWY.Server.Business
                 }
             });
         }
+
+        /// <summary>
+        /// 同步所有店铺的订单
+        /// </summary>
+        public void SyncAllShopOrder()
+        {
+            var shopList = venderBusiness.GetShopList();
+            foreach (var shop in shopList)
+            {
+                Task.Factory.StartNew(() => SyncOrder(shop, string.Empty, isAuto: true), System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler);
+            }
+        }
     }
 }

BBWY.Server.Business/Vender/VenderBusiness.cs

@@ -219,5 +219,10 @@ namespace BBWY.Server.Business
             }
             return departmentList;
         }
+
+        public IList<ShopResponse> GetShopList()
+        {
+            return freeSqlMultiDBManager.MDSfsql.Select<Shops>().Where(s => !string.IsNullOrEmpty(s.ShopId)).ToList<ShopResponse>();
+        }
     }
 }

BBWY.Test/Program.cs

@@ -30,16 +30,43 @@ namespace BBWY.Test
             var token = "940b1e24d84843ffbbee3833984a6f0bwyjf";
             var jdClient = GetJdClient(appKey, appSecret);
 
-            PopAfsSoaRefundapplyQueryPageListRequest req = new PopAfsSoaRefundapplyQueryPageListRequest();
-            //req.ids = "1428310918";
-            req.orderId = "249207996365";
-            req.checkTimeStart = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd HH:mm:ss");
-            req.checkTimeEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            req.pageIndex =1;
-            req.pageSize = 50;
+            //PopAfsSoaRefundapplyQueryPageListRequest req = new PopAfsSoaRefundapplyQueryPageListRequest();
+            ////req.ids = "1428310918";
+            ////req.orderId = "249207996365";
+            //req.checkTimeStart = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd HH:mm:ss");
+            //req.checkTimeEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            //req.pageIndex =1;
+            //req.pageSize = 50;
 
 
-            PopAfsSoaRefundapplyQueryPageListResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
+            //PopAfsSoaRefundapplyQueryPageListResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
+            //Console.WriteLine(JsonConvert.SerializeObject(response));
+
+
+           
+            AscServiceAndRefundViewRequest req = new AscServiceAndRefundViewRequest();
+
+           
+            req.orderId = 249042075658;
+
+            //req.applyTimeBegin = ;
+
+            //req.applyTimeEnd = ;
+
+            //req.approveTimeBegin = ;
+
+            //req.approveTimeEnd = ;
+
+            //req.pageNumber = ;
+
+            //req.pageSize = ;
+
+            //req.extJsonStr = ;
+
+            //req.buId = ;
+
+
+            AscServiceAndRefundViewResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
             Console.WriteLine(JsonConvert.SerializeObject(response));
             Console.ReadKey();
         }