Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@@ -633,8 +633,8 @@ namespace BBWYB.Server.Business
                                        .Set(ps => ps.HYSchemeId, psReq.HYSchemeId)
                                        .Set(ps => ps.HYBDId, psReq.HYBDId)
                                        .Set(ps => ps.Version, newVersion)
-                                       .Set(ps => ps.BelongBargainTeamId, belongBargainTeamId)
-                                       .Set(ps => ps.BelongBargainTeamName, belongBargainTeamName)
+                                       .SetIf(uInfo.isBargainTeam, ps => ps.BelongBargainTeamId, belongBargainTeamId)
+                                       .SetIf(uInfo.isBargainTeam, ps => ps.BelongBargainTeamName, belongBargainTeamName)
                                        .Set(ps => ps.UpdateUserId, uInfo.user.Id)
                                        .Set(ps => ps.UpdateTeamId, uInfo.isBargainTeam ? uInfo.bargainTeam?.Id : uInfo.mainTeam.Id)
                                        .Set(ps => ps.IsBargainTeamUpdate, uInfo.isBargainTeam)

BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs

@@ -35,10 +35,9 @@ namespace BBWYB.Server.Business
 
         public Enums.TriggerOptimizationReason? GetOptimizationReason(SpuTotalSaleInfo s)
         {
-            if (s.IsFirstPurchaseCompleted == false)
-                return Enums.TriggerOptimizationReason.首次采购;
-            if (s.IsFirstPurchaseCompleted == true &&
-                s.IsFirstOptimizationCompleted == false)
+            //if (s.IsFirstPurchaseCompleted == false)
+            //    return Enums.TriggerOptimizationReason.首次采购;
+            if (s.IsFirstOptimizationCompleted == false)   //s.IsFirstPurchaseCompleted == true &&
             {
                 if (s.ItemCount - s.FirstPurchaseCompletedItemCount >= 20)
                     return Enums.TriggerOptimizationReason.首次优化;
@@ -242,6 +241,26 @@ namespace BBWYB.Server.Business
                 }
                 #endregion
 
+                #region 验证过滤条件
+                if (spuOptimizationTask.PrePurchaseAmount < 500 && spuOptimizationTask.PreItemCount < 10)
+                {
+                    //移除spu优化任务
+                    insertSpuOptimizationTaskList.Remove(spuOptimizationTask);
+
+                    //移除sku优化任务
+                    var waitRemoveSkuTaskList = insertSkuOptimizationTaskList.Where(t => t.SpuOptimizationTaskId == spuOptimizationTask.Id).ToList();
+                    foreach (var skuTask in waitRemoveSkuTaskList)
+                        insertSkuOptimizationTaskList.Remove(skuTask);
+                    waitRemoveSkuTaskList.Clear();
+
+                    continue;
+                }
+                #endregion
+
+                #region 暂停一秒区分时间
+                Thread.Sleep(1000);  //mysql的datetime不支持毫秒级，导致插入时间有误差，暂时用Thread.Sleep补偿
+                #endregion
+
                 #region 创建SPU优化议价组任务
                 foreach (var department in bargainTeamList)
                 {
@@ -714,8 +733,9 @@ namespace BBWYB.Server.Business
                                                   .Any());
                 }
             }
-
-            var sql = select.ToSql();
+            var sql = select.OrderBy(t => t.CreateTime)
+                            .Page(request.PageIndex, request.PageSize)
+                            .ToSql();
 
             var taskList = select.OrderBy(t => t.TaskTime)
                                  .Count(out var total)

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -395,11 +395,14 @@ namespace BBWYB.Server.Business.Sync
                     {
                         var spuIdList = waitToCheckSkuSaleOrderList.SelectMany(o => o.OrderSkuList.Select(osku => osku.ProductId)).Distinct().ToList();
 
-                        //没有完成首次采购的spu
-                        var noFisrstPurchasedSpuList = dbSpuTotalSaleInfoList.Union(insertSpuTotalSaleInfoList)
-                                                                             .Where(s => s.IsFirstPurchaseCompleted == false)
-                                                                             .Select(s => s.ProductId)
-                                                                             .ToList();
+                        ////没有完成首次采购的spu
+                        //var noFisrstPurchasedSpuList = dbSpuTotalSaleInfoList.Union(insertSpuTotalSaleInfoList)
+                        //                                                     .Where(s => s.IsFirstPurchaseCompleted == false)
+                        //                                                     .Select(s => s.ProductId)
+                        //                                                     .ToList();
+
+                        //之前没有销量的spu
+                        var noFisrstPurchasedSpuList = insertSpuTotalSaleInfoList.Select(s => s.ProductId).ToList();
 
                         //查询已存在未结束的优化任务
                         var dbSpuOptimizationTaskList = fsql.Select<SpuOptimizationTask>()
@@ -549,6 +552,26 @@ namespace BBWYB.Server.Business.Sync
                                     }
                                     #endregion
 
+                                    #region 验证过滤条件
+                                    if (spuOptimizationTask.PrePurchaseAmount < 500 && spuOptimizationTask.PreItemCount < 10)
+                                    {
+                                        //移除spu优化任务
+                                        insertSpuOptimizationTaskList.Remove(spuOptimizationTask);
+
+                                        //移除sku优化任务
+                                        var waitRemoveSkuTaskList = insertSkuOptimizationTaskList.Where(t => t.SpuOptimizationTaskId == spuOptimizationTask.Id).ToList();
+                                        foreach (var skuTask in waitRemoveSkuTaskList)
+                                            insertSkuOptimizationTaskList.Remove(skuTask);
+                                        waitRemoveSkuTaskList.Clear();
+
+                                        continue;
+                                    }
+                                    #endregion
+
+                                    #region 暂停一秒区分时间
+                                    Thread.Sleep(1000);  //mysql的datetime不支持毫秒级，导致插入时间有误差，暂时用Thread.Sleep补偿
+                                    #endregion
+
                                     #region 创建SPU优化议价组任务
                                     foreach (var department in bargainTeamList)
                                     {

BBWYB.Server.Business/_1688Helper/Collect1688Helper.cs

@@ -155,7 +155,7 @@ namespace BBWYB.Server.Business._1688Helper
                         foreach (HtmlNode zone_order in zone_orders)
                         {
                             // 获取 data-source 属性的值
-                            string dataSourceValue = zone_order.GetAttributeValue("data-source", "");
+                            string dataSourceValue = zone_order.GetAttributeValue("data-source", "")?.Replace(""", "\"");
 
                             var groupHeaderJson = JsonConvert.DeserializeObject<dynamic>(dataSourceValue);
                             //sellerMemberId
@@ -192,7 +192,7 @@ namespace BBWYB.Server.Business._1688Helper
                                 if (groupDivDataSource != null)
                                 {
 
-                                    var json = JsonConvert.DeserializeObject<dynamic>(groupDivDataSource);
+                                    var json = JsonConvert.DeserializeObject<dynamic>(groupDivDataSource?.Replace("&quot;", "\""));
                                     group = json.group.ToString();
                                     stepName = json.stepName.ToString();
                                 }