1

BBWY.Server.Business/EarlyWarning/JD/JDStockNumWarningBusiness.cs

@@ -136,8 +136,8 @@ namespace BBWY.Server.Business
                     logContentBuilder.AppendLine($"SKU:{sku}");
                     logContentBuilder.AppendLine($"商品状态:{skuStockNumCycleType}");
                     logContentBuilder.AppendLine($"第一周销量:{firstCycleItemTotal}");
-                    logContentBuilder.AppendLine($"第二周期销量:{secondCycleItemTotal}, 相比第一周幅度:{_2Ratio}%");
+                    logContentBuilder.AppendLine($"第二周期销量:{secondCycleItemTotal}, 相比第一周幅度:{_2Ratio * 100}%");
-                    logContentBuilder.AppendLine($"第三周期销量:{thirdCycleItemTotal}, 相比第二周幅度:{_3Ratio}%");
+                    logContentBuilder.AppendLine($"第三周期销量:{thirdCycleItemTotal}, 相比第二周幅度:{_3Ratio * 100}%");
                     logContentBuilder.AppendLine($"近7天销量:{_7dItemTotal}");
                     logContentBuilder.AppendLine($"近15天销量:{_15dItemTotal}");
                     logContentBuilder.AppendLine($"7天日均销量:{_7dAvgItemTotal}");
@@ -242,7 +242,7 @@ namespace BBWY.Server.Business
                                 if (suggestStockNum != 0)
                                     dingdingContentBuilder.Append($"{skuStockNumGroup.Key}库存低于安全周转天数,建议备货{suggestStockNum}件");
                                 else
-                                    dingdingContentBuilder.Append($"近15天销量低于两件,建议暂停备货,采购代发");
+                                    dingdingContentBuilder.Append($"建议暂停备货,采购代发");
                             }
                             else if (skuStockNumCycleType == Enums.SkuStockNumCycleType.衰退期)
                                 dingdingContentBuilder.Append($"{skuStockNumGroup.Key}库存商品进入衰退期,建议暂停备货,采购代发");

BBWY.Server.Business/Sync/OrderSkuSaleDetailSyncBusiness.cs

@@ -37,8 +37,8 @@ namespace BBWY.Server.Business
                                  .InnerJoin((osku, o) => osku.OrderId == o.Id)
                                  .WhereIf(shopId != null, (osku, o) => o.ShopId == shopId)
                                  .Where((osku, o) => o.StartTime >= startDate && o.StartTime <= endTime)
-                                 .Where((osku, o) => o.StorageType != Model.Enums.StorageType.SD)   
+                                 .Where((osku, o) => o.StorageType != Model.Enums.StorageType.SD)
-                                 .Where((osku, o) => o.OrderState != Model.Enums.OrderState.已取消)
+                                 //.Where((osku, o) => o.OrderState != Model.Enums.OrderState.已取消)
                                  .GroupBy((osku, o) => new
                                  {
                                      o.Platform,
@@ -92,7 +92,7 @@ namespace BBWY.Server.Business
                                      .InnerJoin((gos, go) => gos.GiftOrderId == go.Id)
                                      .WhereIf(shopId != null, (gos, go) => go.ShopId == shopId)
                                      .Where((gos, go) => go.StartTime >= startDate && go.StartTime <= endTime)
-                                     .Where((gos, go) => go.OrderState != Model.Enums.OrderState.已取消)
+                                     //.Where((gos, go) => go.OrderState != Model.Enums.OrderState.已取消)
                                      .GroupBy((gos, go) => new
                                      {
                                          go.Platform,
@@ -143,7 +143,6 @@ namespace BBWY.Server.Business
 
             insertSkuDailySalesDetailList.AddRange(oskuGroups);
 
-
             foreach (var canceloSkuGroup in cancelOskuGroups)
             {
                 var skuDaily = insertSkuDailySalesDetailList.FirstOrDefault(s => s.ShopId == canceloSkuGroup.ShopId &&