From 8475ec10adf003da8e11d1581da5aaf0919543bd Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 10 Jan 2024 22:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=95=86=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=90=8E=E9=87=87=E8=B4=AD=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Aggregion/AggregionPurchaserBusiness.cs   | 29 ++++++++++---------
 BBWYB.Server.Model/Db/Purchaser/Purchaser.cs  |  2 +-
 .../Response/Purchaser/PurchaserResponse.cs   |  5 ++++
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/BBWYB.Server.Business/Aggregion/AggregionPurchaserBusiness.cs b/BBWYB.Server.Business/Aggregion/AggregionPurchaserBusiness.cs
index 07cbdcf..1094bed 100644
--- a/BBWYB.Server.Business/Aggregion/AggregionPurchaserBusiness.cs
+++ b/BBWYB.Server.Business/Aggregion/AggregionPurchaserBusiness.cs
@@ -140,19 +140,19 @@ namespace BBWYB.Server.Business
 
             #region 查询最近90天采购金额
             var recent90dPurchasedAmountList = fsql.Select<OrderCostDetail, Order, OrderPurchaseInfo>()
-                                         .InnerJoin((ocd, o, opi) => ocd.OrderId == o.Id)
-                                         .InnerJoin((ocd, o, opi) => o.Id == opi.OrderId)
-                                         .Where((ocd, o, opi) => o.OrderState != Enums.OrderState.已取消 &&
-                                                                      ocd.IsEnabled == true &&
-                                                                      opi.IsEnabled == true &&
-                                                                      opi.CreateTime >= recent90d &&
-                                                                      purchaserIdList.Contains(opi.PurchaserId))
-                                         .GroupBy((ocd, o, opi) => opi.PurchaserId)
-                                         .ToList(g => new
-                                         {
-                                             PurchaserId = g.Key,
-                                             PurchasedAmount = g.Sum(g.Value.Item1.SkuAmount + g.Value.Item1.PurchaseFreight)
-                                         });
+                                                   .InnerJoin((ocd, o, opi) => ocd.OrderId == o.Id)
+                                                   .InnerJoin((ocd, o, opi) => o.Id == opi.OrderId)
+                                                   .Where((ocd, o, opi) => o.OrderState != Enums.OrderState.已取消 &&
+                                                                                ocd.IsEnabled == true &&
+                                                                                opi.IsEnabled == true &&
+                                                                                opi.CreateTime >= recent90d &&
+                                                                                purchaserIdList.Contains(opi.PurchaserId))
+                                                   .GroupBy((ocd, o, opi) => opi.PurchaserId)
+                                                   .ToList(g => new
+                                                   {
+                                                       PurchaserId = g.Key,
+                                                       PurchasedAmount = g.Sum(g.Value.Item1.SkuAmount + g.Value.Item1.PurchaseFreight)
+                                                   });
             #endregion
 
             foreach (var purchaserId in purchaserIdList)
@@ -172,7 +172,7 @@ namespace BBWYB.Server.Business
                 #region 订单数/最近采购时间
                 var purchasedCountAndTime = poList.FirstOrDefault(x => x.PurchaserId == purchaserId);
                 var purchasedCount = purchasedCountAndTime?.Count ?? 0;
-                var lastPurchaseTime = purchasedCountAndTime?.MaxPurchaseTime;
+                var lastPurchasedTime = purchasedCountAndTime?.MaxPurchaseTime;
                 #endregion
 
                 #region 采购金额
@@ -194,6 +194,7 @@ namespace BBWYB.Server.Business
                                  .Set(p => p.PurchasedSkuCount, purchasedSkuCount)
                                  .Set(p => p.PurchasedCount, purchasedCount)
                                  .Set(p => p.PurchasedAmount, purchasedAmount)
+                                 .Set(p => p.LastPurchasedTime, lastPurchasedTime)
                                  .Set(p => p.Recent90dPurchasedAmount, recent90dPurchasedAmount)
                                  .Set(p => p.Recent90dPurchasedCount, recent90dPurchasedCount);
                 updatePurchaserList.Add(update);
diff --git a/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs b/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs
index f3c94bc..85a8c5b 100644
--- a/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs
+++ b/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs
@@ -95,7 +95,7 @@ namespace BBWYB.Server.Model.Db
         /// 上次采购时间
         /// </summary>
         [Column(DbType = "datetime")]
-        public DateTime? LastPurchaseTime { get; set; }
+        public DateTime? LastPurchasedTime { get; set; }
 
         /// <summary>
         /// 最近90天采购金额
diff --git a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
index 3435497..f043573 100644
--- a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
@@ -25,6 +25,11 @@ namespace BBWYB.Server.Model.Dto
         /// </summary>
         public decimal? PurchaseAmount { get { return PurchasedAmount; } }
 
+        /// <summary>
+        /// 最近采购时间容错字段
+        /// </summary>
+        public DateTime? LastPurchaseTime { get { return LastPurchasedTime; } }
+
         public PurchaserResponse()
         {
             CategoryList = new List<PurchaserExtendedInfoResponse>();