合并冲突

BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs

@@ -5,7 +5,6 @@ using BBWYB.Common.Models;
 using BBWYB.Server.Model;
 using BBWYB.Server.Model.Db;
 using BBWYB.Server.Model.Db.HY;
-using BBWYB.Server.Model.Db.SkuOptimization;
 using BBWYB.Server.Model.Dto;
 using FreeSql;
 using Newtonsoft.Json.Linq;

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -5,7 +5,6 @@ using BBWYB.Common.Models;
 using BBWYB.Server.Business.Extensions;
 using BBWYB.Server.Model;
 using BBWYB.Server.Model.Db;
-using BBWYB.Server.Model.Db.SkuOptimization;
 using BBWYB.Server.Model.Dto;
 using FreeSql;
 using Microsoft.Extensions.DependencyInjection;

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -8,7 +8,6 @@ using BBWYB.Server.Model.Core;
 using BBWYB.Server.Model.Db;
 using BBWYB.Server.Model.Db.Mds;
 using BBWYB.Server.Model.Db.MDS;
-using BBWYB.Server.Model.Db.SkuOptimization;
 using BBWYB.Server.Model.Dto;
 using FreeSql;
 using Microsoft.Extensions.DependencyInjection;
@@ -581,7 +580,7 @@ namespace BBWYB.Server.Business
                 var dbSkuAndPurchaserRelationList = fsql.Select<SkuHistoryPurchaserRelation>()
                                                         .Where(spr => purchaserIdList.Contains(spr.PurchaserId) && spr.ShopId == request.ShopId)
                                                         .ToList();
-
+                var dbPurchaserList = fsql.Select<Purchaser>(purchaserIdList).ToList();
                 foreach (var purchaserId in purchaserIdList)
                 {
                     purchaserSkuDictionary.TryGetValue(purchaserId, out var fromRequestSkuList);
@@ -602,10 +601,15 @@ namespace BBWYB.Server.Business
                             SkuId = x
                         }));
                     }
-                    //var update = fsql.Update<Purchaser>(purchaserId)
-                    //                 .Set(p => p.PurchasedCount + 1)
-                    //                 .SetIf(newSkuRelationCount > 0, p => p.PurchasedSkuCount + newSkuRelationCount);
-                    //updatePurchaserList.Add(update);
+
+                    #region 更新采购商归属
+                    var purchaser = dbPurchaserList.FirstOrDefault(p => p.Id == purchaserId);
+                    if (purchaser != null && !string.IsNullOrEmpty(purchaser.BelongBargainTeamId) && purchaser.BelongType == Enums.PurchaserBelongType.临时)
+                    {
+                        var updatePurchaser = fsql.Update<Purchaser>(purchaserId).Set(p => p.BelongType, Enums.PurchaserBelongType.永久);
+                        updatePurchaserList.Add(updatePurchaser);
+                    }
+                    #endregion
                 }
 
             }
@@ -794,11 +798,11 @@ namespace BBWYB.Server.Business
                 if (updateSkuOptimizationPurhcasementByIdList.Count() > 0)
                     fsql.Update<SkuOptimizationTask>(updateSkuOptimizationPurhcasementByIdList).Set(s => s.IsPurchasementCompleted, true).ExecuteAffrows();
 
-                //if (updatePurchaserList.Count() > 0)
-                //{
-                //    foreach (var update in updatePurchaserList)
-                //        update.ExecuteAffrows();
-                //}
+                if (updatePurchaserList.Count() > 0)
+                {
+                    foreach (var update in updatePurchaserList)
+                        update.ExecuteAffrows();
+                }
             });
 
             //#region 更新采购方案最新价格

BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs

@@ -4,7 +4,6 @@ using BBWYB.Common.Models;
 using BBWYB.Server.Model;
 using BBWYB.Server.Model.Db;
 using BBWYB.Server.Model.Db.BBWY;
-using BBWYB.Server.Model.Db.SkuOptimization;
 using BBWYB.Server.Model.Dto;
 using FreeSql;
 using Newtonsoft.Json;

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -2,7 +2,6 @@
 using BBWYB.Common.Models;
 using BBWYB.Server.Model;
 using BBWYB.Server.Model.Db;
-using BBWYB.Server.Model.Db.SkuOptimization;
 using BBWYB.Server.Model.Dto;
 using FreeSql;
 using Newtonsoft.Json.Linq;
@@ -146,7 +145,6 @@ namespace BBWYB.Server.Business.Sync
 
                 List<SkuOptimizationTask> insertSkuOptimizationTaskList = new List<SkuOptimizationTask>();
                 List<SkuOptimizationChildTask> insertSkuOptimizationChildTaskList = new List<SkuOptimizationChildTask>();
-                List<SkuOptimizationCompetitiveTenderTask> insertCompetitiveTenderList = new List<SkuOptimizationCompetitiveTenderTask>();
                 #endregion
 
                 //等待检查sku销量的订单集合
@@ -467,58 +465,58 @@ namespace BBWYB.Server.Business.Sync
                 //                        insertSkuOptimizationTaskList.Add(skuOptimizationTask);
                 //                        #endregion
 
-                //                        #region 创建待优化子任务
-                //                        {
-                //                            foreach (var department in bargainTeamList)
-                //                            {
-                //                                var skuOptimizationChildTask = new SkuOptimizationChildTask()
-                //                                {
-                //                                    Id = idGenerator.NewLong(),
-                //                                    BelongTeamId = department.Id,
-                //                                    BelongTeamName = department.DepartmentName,
-                //                                    CompletionTime = null,
-                //                                    IsOptimizationCompleted = false,
-                //                                    OptimizationTaskId = skuOptimizationTask.Id
-                //                                };
-                //                                insertSkuOptimizationChildTaskList.Add(skuOptimizationChildTask);
+                                        #region 创建待优化子任务
+                                        {
+                                            foreach (var department in bargainTeamList)
+                                            {
+                                                var skuOptimizationChildTask = new SkuOptimizationChildTask()
+                                                {
+                                                    Id = idGenerator.NewLong(),
+                                                    BelongTeamId = department.Id,
+                                                    BelongTeamName = department.DepartmentName,
+                                                    CompletionTime = null,
+                                                    IsOptimizationCompleted = false,
+                                                    OptimizationTaskId = skuOptimizationTask.Id
+                                                };
+                                                insertSkuOptimizationChildTaskList.Add(skuOptimizationChildTask);
 
-                //                                #region 创建竞标任务
-                //                                var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId &&
-                //                                                                                               ps.BelongBargainTeamId == department.Id)
-                //                                                                                  .ToList();
+                                                #region 创建竞标任务
+                                                var schemeList = waitToCompetitiveTenderSchemeList.Where(ps => ps.SkuId == waitCheckOrderSku.SkuId &&
+                                                                                                               ps.BelongBargainTeamId == department.Id)
+                                                                                                  .ToList();
 
-                //                                #endregion
-                //                            }
-                //                        }
-                //                        #endregion
+                                                #endregion
+                                            }
+                                        }
+                                        #endregion
 
                 //                        #region 创建待优化限时任务
 
                 //                        //判断sku是否首次采购
                 //                        var isFirst = !dbSkuTotalSaleInfoList.Any(s => s.SkuId == waitCheckOrderSku.SkuId);
 
-                //                        insertTimeLimitTaskList.Add(new TimeLimitTask()
-                //                        {
-                //                            Id = idGenerator.NewLong(),
-                //                            CreateTme = DateTime.Now,
-                //                            //ExpirationTime = DateTime.Now.AddDays(isFirst ? 2 : 1),
-                //                            ExpirationTime = timeLimitRules.CalculateExpirationTime(Enums.TimeLimitTaskType.待议价任务, DateTime.Now.AddDays(isFirst ? 1 : 0)),
-                //                            //OrderId = o.OrderId,
-                //                            //OrderSn = o.OrderSn,
-                //                            ShopId = shopId,
-                //                            SkuId = waitCheckOrderSku.SkuId,
-                //                            TaskType = Enums.TimeLimitTaskType.待议价任务,
-                //                            TaskId = skuOptimizationTask.Id,
-                //                            Remark = "首次采购限时任务"
-                //                        });
-                //                        #endregion
-                //                    }
-                //                }
-                //            }
-                //        }
-                //    }
-                //}
-                //#endregion
+                                        insertTimeLimitTaskList.Add(new TimeLimitTask()
+                                        {
+                                            Id = idGenerator.NewLong(),
+                                            CreateTme = DateTime.Now,
+                                            //ExpirationTime = DateTime.Now.AddDays(isFirst ? 2 : 1),
+                                            ExpirationTime = timeLimitRules.CalculateExpirationTime(Enums.TimeLimitTaskType.待议价任务, DateTime.Now.AddDays(isFirst ? 1 : 0)),
+                                            //OrderId = o.OrderId,
+                                            //OrderSn = o.OrderSn,
+                                            ShopId = shopId,
+                                            SkuId = waitCheckOrderSku.SkuId,
+                                            TaskType = Enums.TimeLimitTaskType.待议价任务,
+                                            TaskId = skuOptimizationTask.Id,
+                                            Remark = "首次采购限时任务"
+                                        });
+                                        #endregion
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                #endregion
 
                 #region 检查限时采购任务
                 CheckPurchaseTimeLimitTask(shopId, qtOrderList.Items, dbPurchaseTimeLimitTaskList, insertTimeLimitTaskList);
@@ -544,8 +542,8 @@ namespace BBWYB.Server.Business.Sync
                     //if (insertSkuOptimizationChildTaskList.Count() > 0)
                     //    fsql.Insert(insertSkuOptimizationChildTaskList).ExecuteAffrows();
 
-                    //if (insertCompetitiveTenderList.Count() > 0)
-                    //    fsql.Insert(insertCompetitiveTenderList).ExecuteAffrows();
+                    if (insertCompetitiveTenderList.Count() > 0)
+                        fsql.Insert(insertCompetitiveTenderList).ExecuteAffrows();
 
                     if (updateOrderList.Count() > 0)
                         foreach (var update in updateOrderList)

BBWYB.Server.Model/Db/SkuOptimization/SkuOptimizationCompetitiveTenderTask.cs

@@ -1,66 +0,0 @@
-using FreeSql.DataAnnotations;
-
-namespace BBWYB.Server.Model.Db
-{
-
-    /// <summary>
-    /// 采购方案竞标表
-    /// </summary>
-    [Table(Name = "skuoptimizationcompetitivetendertask", DisableSyncStructure = true)]
-    public partial class SkuOptimizationCompetitiveTenderTask
-    {
-        [Column(DbType = "bigint", IsPrimary = true)]
-        public long Id { get; set; }
-
-        [Column(DbType = "bigint")]
-        public long? ChildTaskId { get; set; }
-
-        [Column(DbType = "datetime")]
-        public DateTime? CreateTime { get; set; }
-
-        /// <summary>
-        /// 是否更新报价
-        /// </summary>
-        public bool? IsUpdateQuotedPrice { get; set; }
-
-        /// <summary>
-        /// 更新后的运费
-        /// </summary>
-        public decimal? NewFreight { get; set; }
-
-        /// <summary>
-        /// 更新后的报价
-        /// </summary>
-        public decimal? NewQuotedPrice { get; set; }
-
-        /// <summary>
-        /// 未更新的运费
-        /// </summary>
-        public decimal? OldFreight { get; set; }
-
-        /// <summary>
-        /// 未更新的报价
-        /// </summary>
-        public decimal? OldQuotedPrice { get; set; }
-
-        [Column(DbType = "bigint")]
-        public long? SchemeId { get; set; }
-
-        [Column(DbType = "bigint")]
-        public long? TaskId { get; set; }
-
-        [Column(StringLength = 50)]
-        public string SkuId { get; set; }
-
-        [Column(DbType = "bigint")]
-        public long? TeamId { get; set; }
-
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        [Column(DbType = "datetime")]
-        public DateTime? UpdateTime { get; set; }
-
-    }
-
-}

BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationChildTaskResponse.cs

@@ -1,4 +1,4 @@
-using BBWYB.Server.Model.Db.SkuOptimization;
+using BBWYB.Server.Model.Db;
 
 namespace BBWYB.Server.Model.Dto
 {

BBWYB.Server.Model/Dto/Response/Optimization/SkuOptimizationTaskResponse.cs

@@ -1,5 +1,4 @@
 using BBWYB.Server.Model.Db;
-using BBWYB.Server.Model.Db.SkuOptimization;
 
 namespace BBWYB.Server.Model.Dto
 {

BBWYB.Server.Model/Dto/Response/Product/SkuOptimizationHistoryResponse.cs

@@ -1,4 +1,4 @@
-using BBWYB.Server.Model.Db.SkuOptimization;
+using BBWYB.Server.Model.Db;
 
 namespace BBWYB.Server.Model.Dto
 {

BBWYB.Server.Model/MappingProfiles.cs

@@ -1,6 +1,5 @@
 using AutoMapper;
 using BBWYB.Server.Model.Db;
-using BBWYB.Server.Model.Db.SkuOptimization;
 using BBWYB.Server.Model.Dto;
 
 namespace BBWYB.Server.Model