diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 12614af..b1fc0bb 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 520; - //public static int VersionCount = 520; + public static int VersionCount = 521; + //public static int VersionCount = 521; /// /// 版本号 diff --git a/AllBase/Model/Param/SalesManage/TemuActivityParam.cs b/AllBase/Model/Param/SalesManage/TemuActivityParam.cs index b9a2186..28554bc 100644 --- a/AllBase/Model/Param/SalesManage/TemuActivityParam.cs +++ b/AllBase/Model/Param/SalesManage/TemuActivityParam.cs @@ -44,6 +44,8 @@ namespace AllBase.Model.Param.SalesManage /// /// public List skcList { get; set; } + + public List sessionIds { get; set; } = new List(); } public class TemuActivityParam diff --git a/AllBase/Model/Result/TemuActivityMatchProductInfo.cs b/AllBase/Model/Result/TemuActivityMatchProductInfo.cs index 33790e9..d5e8e13 100644 --- a/AllBase/Model/Result/TemuActivityMatchProductInfo.cs +++ b/AllBase/Model/Result/TemuActivityMatchProductInfo.cs @@ -14,6 +14,18 @@ namespace AllBase.Model.Result public int? suggestActivityStock { get; set; } public string productName { get; set; } public List skcList { get; set; } + public object isHotProduct { get; set; } + public List enrollSessionIdList { get; set; } + public string currency { get; set; } + public object refuseActivityLimit { get; set; } + public int? isHighPriceProduct { get; set; } + public int? hasAdTrafficSupport { get; set; } + public object privilegeSuggestActivityStock { get; set; } + public TemuActivityProductExtVOItem activityProductExtVO { get; set; } + public object adCouponClaimable { get; set; } + public object salesStock { get; set; } + public List suggestEnrollSessionIdList { get; set; } + public object estimatedIncrease { get; set; } } public class TemuActivitySkcInfo @@ -32,4 +44,10 @@ namespace AllBase.Model.Result public string currenty { get; set; } public Dictionary properties { get; set; } } + + public class TemuActivityProductExtVOItem + { + public List hasSameStyleSkuIdList { get; set; } + public int? highPriceTag { get; set; } + } } diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs index 143a9f1..d34b6fc 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs @@ -318,6 +318,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms if (jsonRst.Contains("当前操作人数太多,请稍后重试") && tryCount < 5) { tryCount++; + Thread.Sleep(Randomx.GetId(3000, 5000)); goto tryAgain; } @@ -429,7 +430,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms { sActivityTime = BaseClass.StampToDateTime((int)(actInfo.startTime.ParseToLong() / 1000)).ToString("yyyy/MM/dd HH:mm:ss") + "~" + BaseClass.StampToDateTime((int)(actInfo.endTime.ParseToLong() / 1000)).ToString("yyyy/MM/dd HH:mm:ss") + "(" + - actInfo.durationDays + "天)"; + (actInfo.durationDays > 0 ? actInfo.durationDays + "天" : "长期") + ")"; } string sActivityRemaining = "-"; TimeSpan timeRemaining = BaseClass.StampToDateTime((int)(actInfo.enrollDeadLine.ParseToLong() / 1000)) - DateTime.Now; @@ -576,9 +577,10 @@ namespace TemuKJD.KJDForms.SalesCenterForms })); continue; } - if (jsonRst.Contains("当前操作人数太多,请稍后重试") && tryCount < 5) + if ((jsonRst.Contains("当前操作人数太多,请稍后重试") || jsonRst.Contains("too quickly")) && tryCount < 5) { tryCount++; + Thread.Sleep(Randomx.GetId(3000, 5000)); goto tryAgain; } if (!jsonRst.Contains("\"success\":true")) @@ -927,8 +929,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms // 相同的是主活动,不需要activityThematicId就可以报名。 if (activity.activityThematicId != activity.activityType) activityParam.activityThematicId = activity.activityThematicId; - activityParam.productList = new List(); + activityParam.productList = new List(); foreach (var prod in prodLst) { int discount = this.GetNearDiscount(activity.discount.ParseToInt()); @@ -969,6 +971,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms activityProditem.productId = prod.productId; activityProditem.activityStock = inventory; activityProditem.skcList = new List(); + activityProditem.sessionIds = prod.suggestEnrollSessionIdList; ActSkcListItem actSkcListItem = new ActSkcListItem(); actSkcListItem.skcId = prod.skcList.FirstOrDefault()?.skcId;