diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj
index 8a8a80a..601647e 100644
--- a/AllBase/AllBase.csproj
+++ b/AllBase/AllBase.csproj
@@ -189,6 +189,7 @@
+
@@ -197,6 +198,8 @@
+
+
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 8d120c4..d73032c 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 601;
+ public static int VersionCount = 605;
//public static int VersionCount = 599;
///
diff --git a/AllBase/BaseRegex.cs b/AllBase/BaseRegex.cs
index 4995e8a..cd1e524 100644
--- a/AllBase/BaseRegex.cs
+++ b/AllBase/BaseRegex.cs
@@ -676,13 +676,14 @@ namespace AllBase
///
///
///
- public static string GetStringQuery(ref string querString, string key)
+ public static string GetStringQuery(ref string queryString, string key)
{
- int nIndex = querString.IndexOf(key + "=");
+ var queryStringTmp = "&" + queryString;
+ int nIndex = queryStringTmp.IndexOf(key + "=");
if (nIndex == -1)
return null;
- string temp = querString.Substring(nIndex).Replace(key + "=", "");
+ string temp = queryStringTmp.Substring(nIndex).Replace(key + "=", "");
nIndex = temp.IndexOf('&');
if (nIndex > -1)
temp = temp.Substring(0, nIndex);
diff --git a/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.cs b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.cs
index 6ae2107..0dee17a 100644
--- a/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.cs
+++ b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.cs
@@ -8,19 +8,23 @@ namespace AllBase.Model.Param.PDDProdParam
{
public class PDDActivitySubmitParam
{
- public long? activity_id { get; set; } = 20981;
+ public long? activity_id { get; set; } = 20981; //23620 21365 15996
public List goods_volist { get; set; } = new List();
public create_protocol_vo_item create_protocol_vo { get; set; } = new create_protocol_vo_item();
+ public object custom_ability_vo { get; set; } = new object();
public create_outer_activity_price_ratio_vo_item create_outer_activity_price_ratio_vo { get; set; } = new create_outer_activity_price_ratio_vo_item();
public enroll_source_ctx_item enroll_source_ctx { get; set; } = new enroll_source_ctx_item();
- public string behavior_collection_v1_cas_boost_factor { get; set; } = "dXlyaGxldXItNDkwOTQzMTM0LTE3NTgzNzMzNDQwMjE=";
+
+ // 15996 dXlyaGxldXItNDkwOTQzMTM0LTE3NTg2OTQxODA2MzE=
+ public string behavior_collection_v1_cas_boost_factor { get; set; } = "dXlyaGxldXItNDkwOTQzMTM0LTE3NTgzNzMzNDQwMjE=";
}
public class enroll_source_ctx_item
{
- public int? enroll_type { get; set; } = 34;
- public string scene_full_coverage { get; set; } = "mmsActQuickEnrollMultiActivityRealTableV1";
- public string source_type { get; set; } = "PROMO-OwnHome_MultiActEnrollMMS";
+ public int? enroll_type { get; set; } = 3; // 20981 34, 15996 3
+ public string scene_full_coverage { get; set; } = "mmsActBatchEnrollV1"; // 20981 mmsActQuickEnrollMultiActivityRealTableV1, 15996 mmsActBatchEnrollV1
+ public string source_type { get; set; } = "MMSActicon"; // 20981 PROMO-OwnHome_MultiActEnrollMMS, 15996 MMSActicon
+ public string scene_type { get; set; } = "ActivityCard"; // 10981 无, 15996 ActivityCard
}
public class create_outer_activity_price_ratio_vo_item
@@ -30,27 +34,40 @@ namespace AllBase.Model.Param.PDDProdParam
public class create_protocol_vo_item
{
- public bool? need_create_cost_template { get; set; } = true;
+ public bool? need_create_cost_template { get; set; } = false; //如运费模板不满足要求,同意为您自动切换为活动适用的运费模板
}
public class goods_vo_param
{
public long? goods_id { get; set; }
+ public object create_goods_coupon_vo { get; set; } = new object();
+ public object create_finance_cost_vo { get; set; } = new object();
public create_material_vo_param create_material_vo { get; set; } = new create_material_vo_param();
public view_confirmed_goods_protocol_vo_item view_confirmed_goods_protocol_vo { get; set; } = new view_confirmed_goods_protocol_vo_item();
public create_activity_price_vo_item create_activity_price_vo { get; set; } = new create_activity_price_vo_item();
+ public create_discount_vo_item create_discount_vo { get; set; }
+ }
+
+ public class create_discount_vo_item {
+ public int? multi_percent_discount { get; set; } = 99;
+ public bool? hit_multi_percent { get; set; } = true;
}
public class create_activity_price_vo_item
{
public List create_sku_vos { get; set; } = new List();
public create_traffic_protect_vo_item create_traffic_protect_vo { get; set; } = new create_traffic_protect_vo_item();
- public object create_quantity_vo { get; set; } = new object();
+ public create_quantity_vo_item create_quantity_vo { get; set; } = new create_quantity_vo_item();
+ public object create_time_vo { get; set; } = new object();
+ }
+
+ public class create_quantity_vo_item {
+ public int? goods_activity_quantity { get; set; }
}
public class create_traffic_protect_vo_item
{
- public int? max_cut_price_amount { get; set; } = 100;
+ public int? max_cut_price_amount { get; set; } = 50; //任意规格当前价失效时,降价0.5元恢复活动权益 //可考虑转换为总价的百分比
}
public class create_sku_vo_item
@@ -65,16 +82,22 @@ namespace AllBase.Model.Param.PDDProdParam
public int? filling_sku_price { get; set; }
public int? gear_rule { get; set; }
public int? require_price { get; set; }
+ public int? filling_sku_price_gear_rule { get; set; } = 1001; // 1001
+ public object algorithm_decorate_sku_price { get; set; } // null
+ public object tags { get; set; } // null
}
public class view_confirmed_goods_protocol_vo_item
{
public object confirm_hit_cut_price { get; set; } = null;
+ public bool? confirm_copy_goods_for_customer_num { get; set; } = false;
+ public bool? confirm_hit_high_commission { get; set; } = false;
}
public class create_material_vo_param
{
public object create_goods_image_vo { get; set; } = new object();
+ public object create_goods_title_vo { get; set; } = new object();
}
}
diff --git a/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs
new file mode 100644
index 0000000..e9313ea
--- /dev/null
+++ b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Param.PDDProdParam20981
+{
+ public class PDDActivitySubmitParam20981
+ {
+ public long? activity_id { get; set; } = 20981;
+ public List goods_volist { get; set; } = new List();
+ public create_protocol_vo_item create_protocol_vo { get; set; } = new create_protocol_vo_item();
+ public create_outer_activity_price_ratio_vo_item create_outer_activity_price_ratio_vo { get; set; } = new create_outer_activity_price_ratio_vo_item();
+ public enroll_source_ctx_item enroll_source_ctx { get; set; } = new enroll_source_ctx_item();
+ public string behavior_collection_v1_cas_boost_factor { get; set; } = "dXlyaGxldXItNDkwOTQzMTM0LTE3NTgzNzMzNDQwMjE=";
+ }
+
+ public class enroll_source_ctx_item
+ {
+ public int? enroll_type { get; set; } = 34;
+ public string scene_full_coverage { get; set; } = "mmsActQuickEnrollMultiActivityRealTableV1";
+ public string source_type { get; set; } = "PROMO-OwnHome_MultiActEnrollMMS";
+ }
+
+ public class create_outer_activity_price_ratio_vo_item
+ {
+ public bool? merchant_confirm_outer_activity_price_ratio { get; set; } = true;
+ }
+
+ public class create_protocol_vo_item
+ {
+ public bool? need_create_cost_template { get; set; } = true;
+ }
+
+ public class goods_vo_param
+ {
+ public long? goods_id { get; set; }
+ public create_material_vo_param create_material_vo { get; set; } = new create_material_vo_param();
+ public view_confirmed_goods_protocol_vo_item view_confirmed_goods_protocol_vo { get; set; } = new view_confirmed_goods_protocol_vo_item();
+ public create_activity_price_vo_item create_activity_price_vo { get; set; } = new create_activity_price_vo_item();
+ }
+
+ public class create_activity_price_vo_item
+ {
+ public List create_sku_vos { get; set; } = new List();
+ public create_traffic_protect_vo_item create_traffic_protect_vo { get; set; } = new create_traffic_protect_vo_item();
+ public object create_quantity_vo { get; set; } = new object();
+ }
+
+ public class create_traffic_protect_vo_item
+ {
+ public int? max_cut_price_amount { get; set; } = 50;
+ }
+
+ public class create_sku_vo_item
+ {
+ public sku_front_ctx_vo_item sku_front_ctx_vo { get; set; }
+ public int? sku_activity_price { get; set; }
+ public long? sku_id { get; set; }
+ }
+
+ public class sku_front_ctx_vo_item
+ {
+ public int? filling_sku_price { get; set; }
+ public int? gear_rule { get; set; }
+ public int? require_price { get; set; }
+ }
+
+ public class view_confirmed_goods_protocol_vo_item
+ {
+ public object confirm_hit_cut_price { get; set; } = null;
+ }
+
+ public class create_material_vo_param
+ {
+ public object create_goods_image_vo { get; set; } = new object();
+ }
+}
+
diff --git a/AllBase/Model/Param/PDDProdParam/PDDProductUploadParam.cs b/AllBase/Model/Param/PDDProdParam/PDDProductUploadParam.cs
index ec9a18a..e783fe3 100644
--- a/AllBase/Model/Param/PDDProdParam/PDDProductUploadParam.cs
+++ b/AllBase/Model/Param/PDDProdParam/PDDProductUploadParam.cs
@@ -48,7 +48,7 @@ namespace AllBase.Model.Param.PDDProdParam
public int? third_type { get; set; } = 0;
public List cat_ids { get; set; }
public int? bad_fruit_claim { get; set; } = 0;
- public List