进度监控去掉赠品过滤

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -465,8 +465,11 @@ namespace BBWY.Server.Business
                     throw new BusinessException(response.Msg);
             }
 
-            fsql.Delete<PromotionTask>(request.TaskId).ExecuteAffrows();
+            fsql.Transaction(() =>
-
+            {
+                fsql.Delete<PromotionTask>(request.TaskId).ExecuteAffrows();
+                fsql.Delete<PromotionTaskSkuRecord>().Where(psr => psr.PromotionTaskId == request.TaskId).ExecuteAffrows();
+            });
         }
 
         /// <summary>
@@ -506,7 +509,12 @@ namespace BBWY.Server.Business
                 if (!response.Success)
                     throw new BusinessException(response.Msg);
             }
-            fsql.Delete<PromotionTask>(request.TaskId).ExecuteAffrows();
+
+            fsql.Transaction(() =>
+            {
+                fsql.Delete<PromotionTask>(request.TaskId).ExecuteAffrows();
+                fsql.Delete<PromotionTaskSkuRecord>().Where(psr => psr.PromotionTaskId == request.TaskId).ExecuteAffrows();
+            });
         }
 
         /// <summary>
@@ -566,7 +574,7 @@ namespace BBWY.Server.Business
                                    .InnerJoin((osku, o) => osku.OrderId == o.Id)
                                    .WhereIf(shopId != null, (osku, o) => o.ShopId == shopId)
                                    .Where((osku, o) => validOrderStateList.Contains(o.OrderState.Value))
-                                   .Where((osku, o) => osku.Price > 0 && osku.CreateTime >= querySkuTime)
+                                   .Where((osku, o) => osku.CreateTime >= querySkuTime)
                                    .ToList((osku, o) => new OrderSku
                                    {
                                        CreateTime = osku.CreateTime,

BBWY.Test/JDPromotionAPITest.cs

@@ -11,16 +11,17 @@ namespace BBWY.Test
     {
         public void GetPromotionDetailById(IJdClient client, string token, long promotionId)
         {
-            //{
+            {
+
+                var req = new SellerPromotionV2GetRequest();
+                req.promoId = promotionId;
+                req.promoType = 4;
+                var response = client.Execute(req, token, DateTime.Now.ToLocalTime());
+                Console.WriteLine(JsonConvert.SerializeObject(response));
 
-            //    var req = new SellerPromotionV2GetRequest();
+                Console.WriteLine();
-            //    req.promoId = promotionId;
-            //    req.promoType = 4;
-            //    var response = client.Execute(req, token, DateTime.Now.ToLocalTime());
-            //    Console.WriteLine(JsonConvert.SerializeObject(response));
 
-            //    Console.WriteLine();
+            }
-            //}
             {
                 var pageIndex = 1;
                 while (true)

BBWY.Test/Program.cs

@@ -24,8 +24,8 @@ namespace BBWY.Test
             ////2ace3023200c4ea9aa682bbf8bffee18jztm 布莱特玩具
             //var token = "01dc6f6e7fc34dcd99090d690312556cmdfk"; //齐盛
             //var token = "9fffa982da23446fb035499ae5622f49odjk"; //腾奇
-            //var token = "c22ff4d37b6c4bbd82cd9e8d0dab42dbziyz"; //森王车品
+            var token = "c22ff4d37b6c4bbd82cd9e8d0dab42dbziyz"; //森王车品
-            var token = "44c19a1c1fbd4641957e6e8985ed1358jmtl"; //森王玩具
+            //var token = "44c19a1c1fbd4641957e6e8985ed1358jmtl"; //森王玩具
 
             //var appkey = "120EA9EC65AB017567D78CC1139EEEA5";
             //var appSecret = "8a42bc2301e8439b896e99f5475e0a9b";
@@ -42,29 +42,20 @@ namespace BBWY.Test
 
 
             IJdClient client = GetJdClient(appkey, appSecret);
-            //var p = new JDPromotionAPITest();
+            var p = new JDPromotionAPITest();
+            p.GetPromotionDetailById(client, token, 5625514004);
 
 
-            //var p = new JDProductAPITest();
-            //p.GetSkus(client, token);
             //{
-            //    var req = new SellerPromotionCheckRequest();
+            //    var req = new SellerPromotionV2SuspendRequest();
-            //    req.promoId = 5623871513;
+
-            //    req.status = 4;
+            //    req.requestId = Guid.NewGuid().ToString();
-            //    var res = client.Execute(req, token, DateTime.Now.ToLocalTime());
+            //    req.promoId = 562425929;
+            //    req.promoType = 4;
+            //    var res = client.Execute(req, "44c19a1c1fbd4641957e6e8985ed1358jmtl", DateTime.Now.ToLocalTime());
             //    Console.WriteLine(JsonConvert.SerializeObject(res));
             //}
 
-            {
-                var req = new SellerPromotionV2SuspendRequest();
-
-                req.requestId = Guid.NewGuid().ToString();
-                req.promoId = 562425929;
-                req.promoType = 4;
-                var res = client.Execute(req, "44c19a1c1fbd4641957e6e8985ed1358jmtl", DateTime.Now.ToLocalTime());
-                Console.WriteLine(JsonConvert.SerializeObject(res));
-            }
-
             Console.ReadKey();
         }
     }