From 1c39aeb35ece7c56dec977053cb661e751f41384 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 29 Aug 2023 12:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E5=88=86=E7=BB=84=E4=B8=8D=E5=90=8C=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseScheme/PurchaseSchemeBusiness.cs  | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 678b70a..006ed26 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -311,22 +311,29 @@ namespace BBWYB.Server.Business
             {
                 ExtractNewPurchaser(batchCURDSchemeRequest.AddPurchaseSchemeList, newPurchaserList);
 
+                #region 新建分组
+                long? newPurchaseGroupId = null;
+                if (batchCURDSchemeRequest.AddPurchaseSchemeList.Any(ps => ps.SchemeGroupId == 0 || ps.SchemeGroupId == null))
+                {
+                    //新增分组
+                    var firstScheme = batchCURDSchemeRequest.AddPurchaseSchemeList.First();
+                    var insertSchemeGroup = new PurchaseSchemeGroup()
+                    {
+                        Id = idGenerator.NewLong(),
+                        CreateTime = DateTime.Now,
+                        GroupName = $"{firstScheme.ProductId}-{DateTime.Now:yyyyMMddHHmmss}",
+                        ProductId = firstScheme.ProductId,
+                        ShopId = firstScheme.ShopId
+                    };
+                    insertPurchaseSchemeGroupsList.Add(insertSchemeGroup);
+                    newPurchaseGroupId = insertSchemeGroup.Id;
+                }
+                #endregion
+
                 foreach (var psReq in batchCURDSchemeRequest.AddPurchaseSchemeList)
                 {
                     if (psReq.SchemeGroupId == null || psReq.SchemeGroupId == 0)
-                    {
-                        //新增分组
-                        var insertSchemeGroup = new PurchaseSchemeGroup()
-                        {
-                            Id = idGenerator.NewLong(),
-                            CreateTime = DateTime.Now,
-                            GroupName = $"{psReq.ProductId}-{DateTime.Now:yyyyMMddHHmmss}",
-                            ProductId = psReq.ProductId,
-                            ShopId = psReq.ShopId
-                        };
-                        insertPurchaseSchemeGroupsList.Add(insertSchemeGroup);
-                        psReq.SchemeGroupId = insertSchemeGroup.Id;
-                    }
+                        psReq.SchemeGroupId = newPurchaseGroupId;
 
                     var ps = new PurchaseScheme()
                     {