待议价任务触发条件考虑时间

BBWYB.Server.Business/SkuOptimization/SkuOptimizationBusiness.cs

@@ -44,11 +44,23 @@ namespace BBWYB.Server.Business
             if (s.IsFirstPurchaseCompleted == false)
                 return Enums.TriggerOptimizationReason.首次采购;
             if (s.IsFirstPurchaseCompleted == true &&
-                s.IsFirstOptimizationCompleted == false &&
+                s.IsFirstOptimizationCompleted == false)
-                s.ItemCount - s.FirstPurchaseCompletedItemCount >= 20)
+            {
-                return Enums.TriggerOptimizationReason.首次优化;
+                if (s.ItemCount - s.FirstPurchaseCompletedItemCount >= 20)
-            if (s.IsFirstOptimizationCompleted == true && s.LastOptimizationItemCount != 0 && s.ItemCount * 1.0 / s.LastOptimizationItemCount >= 2)
+                    return Enums.TriggerOptimizationReason.首次优化;
-                return Enums.TriggerOptimizationReason.再次优化;
+                if (s.LastOptimizationTime != null &&
+                   (DateTime.Now.Date - s.LastOptimizationTime.Value.Date).TotalDays > 30)
+                    return Enums.TriggerOptimizationReason.首次优化;
+            }
+            if (s.IsFirstOptimizationCompleted == true)
+            {
+                if (s.LastOptimizationItemCount != 0 && s.ItemCount * 1.0 / s.LastOptimizationItemCount >= 2)
+                    return Enums.TriggerOptimizationReason.再次优化;
+
+                if (s.LastOptimizationTime != null &&
+                   (DateTime.Now.Date - s.LastOptimizationTime.Value.Date).TotalDays > 30)
+                    return Enums.TriggerOptimizationReason.再次优化;
+            }
             return null;
         }