From f68e4f37fb3838db13d2e1a7e77d28cb0c9d0003 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Fri, 22 Dec 2023 17:32:34 +0800 Subject: [PATCH 1/2] 1 --- .../Dto/Request/PurchaseScheme/QuerySchemeRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs index 8e3047b..31482a4 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs @@ -55,7 +55,7 @@ namespace BBWYB.Server.Model.Dto /// /// 是否包含采购商统计信息 (采购次数/采购SKU数) /// - public int? IncludePurchaserStatisticsInfo { get; set; }; + public int? IncludePurchaserStatisticsInfo { get; set; } } } From d684fd7c00c614b9ea7026a593ba4d0a31adec33 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Fri, 22 Dec 2023 17:34:28 +0800 Subject: [PATCH 2/2] fixbug --- .../DataRepair/DataRepairBusiness.cs | 190 +++++++++--------- .../PurchaseScheme/PurchaseSchemeBusiness.cs | 2 +- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs index b511af3..6a005f5 100644 --- a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs +++ b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs @@ -667,95 +667,95 @@ namespace BBWYB.Server.Business #endregion - #region 采购商累计信息 - { - #region 采购SKU数 - var purchaserPurchasedList = fsql.Select() - .InnerJoin((opri, o, opi) => opri.OrderId == o.Id) - .InnerJoin((opri, o, opi) => opi.OrderId == opri.OrderId && opi.IsEnabled == true) - .Where((opri, o, opi) => !noOrderStateList.Contains(o.OrderState) && o.ShopId != 11 && !string.IsNullOrEmpty(opi.PurchaserId)) - .GroupBy((opri, o, opi) => new { o.ShopId, opi.PurchaserId, opri.BelongSkuId }) - .ToList(g => new - { - g.Key.ShopId, - g.Key.PurchaserId, - g.Key.BelongSkuId - }); - - var purchaserPurchasedGroups = purchaserPurchasedList.GroupBy(x => x.PurchaserId); - foreach (var g in purchaserPurchasedGroups) - { - updatePurchaserList.Add(new Purchaser() - { - Id = g.Key, - PurchasedSkuCount = g.Count(), - PurchasedCount = 0 - }); - insertSkuHistoryPurchaserRelationList.AddRange(g.Select(x => new SkuHistoryPurchaserRelation() - { - CreateTime = DateTime.Now, - Id = idGenerator.NewLong(), - PurchaserId = x.PurchaserId, - ShopId = x.ShopId, - SkuId = x.BelongSkuId - })); - } - #endregion - - #region 采购次数 - /* - select opi.PurchaserId,count(DISTINCT(opi.OrderId)) from orderpurchaserelationinfo opri - inner join `order` o on opri.OrderId=o.Id - inner join orderpurchaseinfo opi on opi.OrderId=opri.OrderId and opi.IsEnabled=1 - where o.OrderState not in (0,6) and o.ShopId !=11 and opi.PurchaserId is not null - group by opi.PurchaserId; - */ - var purchaserPurchasedCountList = fsql.Select() - .InnerJoin((opri, o, opi) => opri.OrderId == o.Id) - .InnerJoin((opri, o, opi) => opi.OrderId == opri.OrderId && opi.IsEnabled == true) - .Where((opri, o, opi) => !noOrderStateList.Contains(o.OrderState) && o.ShopId != 11 && !string.IsNullOrEmpty(opi.PurchaserId)) - .GroupBy((opri, o, opi) => opi.PurchaserId) - .ToList(g => new - { - PurchaserId = g.Key, - //Count = g.Count(g.Value.Item3.OrderId.Distinct()) - Count = SqlExt.DistinctCount(g.Value.Item3.OrderId) - }); - - foreach (var pcount in purchaserPurchasedCountList) - { - var p = updatePurchaserList.FirstOrDefault(x => x.Id == pcount.PurchaserId); - if (p == null) - { - p = new Purchaser() { Id = pcount.PurchaserId, PurchasedSkuCount = 0 }; - updatePurchaserList.Add(p); - } - p.PurchasedCount = Convert.ToInt32(pcount.Count); - } - - //var purchaserPurchasedCountDataTable = fsql.Ado.ExecuteDataTable(@"select opi.PurchaserId,count(DISTINCT(opi.OrderId)) from orderpurchaserelationinfo opri - // inner join `order` o on opri.OrderId = o.Id - // inner join orderpurchaseinfo opi on opi.OrderId = opri.OrderId and opi.IsEnabled = 1 - // where o.OrderState not in (0, 6) and o.ShopId != 11 and opi.PurchaserId is not null - // group by opi.PurchaserId;"); - - //foreach (DataRow dataRow in purchaserPurchasedCountDataTable.Rows) - //{ - // var purchaserId = dataRow[0].ToString(); - // var count = dataRow[1].ToInt32() ?? 0; - - // var p = updatePurchaserList.FirstOrDefault(x => x.Id == purchaserId); - // if (p == null) - // { - // p = new Purchaser() { Id = purchaserId, PurchasedSkuCount = 0 }; - // updatePurchaserList.Add(p); - // } - // p.PurchasedCount = count; - - //} - #endregion - } - #endregion + //#region 采购商累计信息 + //{ + // #region 采购SKU数 + // var purchaserPurchasedList = fsql.Select() + // .InnerJoin((opri, o, opi) => opri.OrderId == o.Id) + // .InnerJoin((opri, o, opi) => opi.OrderId == opri.OrderId && opi.IsEnabled == true) + // .Where((opri, o, opi) => !noOrderStateList.Contains(o.OrderState) && o.ShopId != 11 && !string.IsNullOrEmpty(opi.PurchaserId)) + // .GroupBy((opri, o, opi) => new { o.ShopId, opi.PurchaserId, opri.BelongSkuId }) + // .ToList(g => new + // { + // g.Key.ShopId, + // g.Key.PurchaserId, + // g.Key.BelongSkuId + // }); + + // var purchaserPurchasedGroups = purchaserPurchasedList.GroupBy(x => x.PurchaserId); + // foreach (var g in purchaserPurchasedGroups) + // { + // updatePurchaserList.Add(new Purchaser() + // { + // Id = g.Key, + // PurchasedSkuCount = g.Count(), + // PurchasedCount = 0 + // }); + // insertSkuHistoryPurchaserRelationList.AddRange(g.Select(x => new SkuHistoryPurchaserRelation() + // { + // CreateTime = DateTime.Now, + // Id = idGenerator.NewLong(), + // PurchaserId = x.PurchaserId, + // ShopId = x.ShopId, + // SkuId = x.BelongSkuId + // })); + // } + // #endregion + + // #region 采购次数 + // /* + // select opi.PurchaserId,count(DISTINCT(opi.OrderId)) from orderpurchaserelationinfo opri + // inner join `order` o on opri.OrderId=o.Id + // inner join orderpurchaseinfo opi on opi.OrderId=opri.OrderId and opi.IsEnabled=1 + // where o.OrderState not in (0,6) and o.ShopId !=11 and opi.PurchaserId is not null + // group by opi.PurchaserId; + // */ + // var purchaserPurchasedCountList = fsql.Select() + // .InnerJoin((opri, o, opi) => opri.OrderId == o.Id) + // .InnerJoin((opri, o, opi) => opi.OrderId == opri.OrderId && opi.IsEnabled == true) + // .Where((opri, o, opi) => !noOrderStateList.Contains(o.OrderState) && o.ShopId != 11 && !string.IsNullOrEmpty(opi.PurchaserId)) + // .GroupBy((opri, o, opi) => opi.PurchaserId) + // .ToList(g => new + // { + // PurchaserId = g.Key, + // //Count = g.Count(g.Value.Item3.OrderId.Distinct()) + // Count = SqlExt.DistinctCount(g.Value.Item3.OrderId) + // }); + + // foreach (var pcount in purchaserPurchasedCountList) + // { + // var p = updatePurchaserList.FirstOrDefault(x => x.Id == pcount.PurchaserId); + // if (p == null) + // { + // p = new Purchaser() { Id = pcount.PurchaserId, PurchasedSkuCount = 0 }; + // updatePurchaserList.Add(p); + // } + // p.PurchasedCount = Convert.ToInt32(pcount.Count); + // } + + // //var purchaserPurchasedCountDataTable = fsql.Ado.ExecuteDataTable(@"select opi.PurchaserId,count(DISTINCT(opi.OrderId)) from orderpurchaserelationinfo opri + // // inner join `order` o on opri.OrderId = o.Id + // // inner join orderpurchaseinfo opi on opi.OrderId = opri.OrderId and opi.IsEnabled = 1 + // // where o.OrderState not in (0, 6) and o.ShopId != 11 and opi.PurchaserId is not null + // // group by opi.PurchaserId;"); + + // //foreach (DataRow dataRow in purchaserPurchasedCountDataTable.Rows) + // //{ + // // var purchaserId = dataRow[0].ToString(); + // // var count = dataRow[1].ToInt32() ?? 0; + + // // var p = updatePurchaserList.FirstOrDefault(x => x.Id == purchaserId); + // // if (p == null) + // // { + // // p = new Purchaser() { Id = purchaserId, PurchasedSkuCount = 0 }; + // // updatePurchaserList.Add(p); + // // } + // // p.PurchasedCount = count; + + // //} + // #endregion + //} + //#endregion fsql.Transaction(() => { @@ -774,12 +774,12 @@ namespace BBWYB.Server.Business .Set(ps => ps.PurchasedAmount, updatePs.PurchasedAmount) .ExecuteAffrows(); } - foreach (var updatePurchaser in updatePurchaserList) - { - fsql.Update(updatePurchaser.Id).Set(p => p.PurchasedSkuCount, updatePurchaser.PurchasedSkuCount) - .Set(p => p.PurchasedCount, updatePurchaser.PurchasedCount) - .ExecuteAffrows(); - } + //foreach (var updatePurchaser in updatePurchaserList) + //{ + // fsql.Update(updatePurchaser.Id).Set(p => p.PurchasedSkuCount, updatePurchaser.PurchasedSkuCount) + // .Set(p => p.PurchasedCount, updatePurchaser.PurchasedCount) + // .ExecuteAffrows(); + //} fsql.Insert(insertSpuSaleInfoList).ExecuteAffrows(); fsql.Insert(insertSkuSaleInfoList).ExecuteAffrows(); fsql.Insert(insertSkuHistoryPurchaserRelationList).ExecuteAffrows(); diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 64699c6..c80ae8c 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -1183,7 +1183,7 @@ namespace BBWYB.Server.Business if (!hySchemeResponse.PurchaserList.Any(p => p.Id == hySchemeProductResponse.PurchaserId)) { - hySchemeResponse.PurchaserList.Add(new Purchaser() + hySchemeResponse.PurchaserList.Add(new PurchaserResponse() { Id = hySchemeProductResponse.PurchaserId, Id2 = hySchemeProductResponse.PurchaserId2,