diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj
index c65c837..8a8a80a 100644
--- a/AllBase/AllBase.csproj
+++ b/AllBase/AllBase.csproj
@@ -187,6 +187,8 @@
+
+
@@ -194,6 +196,7 @@
+
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 0148872..dbf606a 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 596;
+ public static int VersionCount = 597;
//public static int VersionCount = 596;
///
diff --git a/AllBase/Model/Param/PDDProdParam/PDDActivityPriceCheckParam.cs b/AllBase/Model/Param/PDDProdParam/PDDActivityPriceCheckParam.cs
new file mode 100644
index 0000000..b7b3eef
--- /dev/null
+++ b/AllBase/Model/Param/PDDProdParam/PDDActivityPriceCheckParam.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Param.PDDProdParam
+{
+ public class PDDActivityPriceCheckParam
+ {
+ public long? activity_id { get; set; }
+ public int? low_price_check_source_type { get; set; }
+ public List goods_list { get; set; }
+ }
+
+ public class GoodsParam
+ {
+ public long? goods_id { get; set; }
+ public List sku_type_list { get; set; }
+ }
+
+ public class SkuTypeItem
+ {
+ public string sku_activity_price_type { get; set; }
+ public List sku_activity_price_list { get; set; }
+ }
+
+ public class SkuActivityPriceItem
+ {
+ public int? sku_activity_price { get; set; }
+ public long? sku_id { get; set; }
+ }
+}
diff --git a/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.cs b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.cs
new file mode 100644
index 0000000..6ae2107
--- /dev/null
+++ b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam.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.PDDProdParam
+{
+ public class PDDActivitySubmitParam
+ {
+ 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; } = 100;
+ }
+
+ 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 abd438c..ec9a18a 100644
--- a/AllBase/Model/Param/PDDProdParam/PDDProductUploadParam.cs
+++ b/AllBase/Model/Param/PDDProdParam/PDDProductUploadParam.cs
@@ -164,7 +164,8 @@ namespace AllBase.Model.Param.PDDProdParam
public int? is_sku_pre_sale { get; set; } = 0;
public int? is_group_pre_sale { get; set; } = 0;
- public List goods_properties { get; set; }
+ //public List goods_properties { get; set; }
+ public List goods_properties { get; set; }
public object is_goods_copy { get; set; }
public bool? is_auto_save { get; set; } = false;
public string validate_message { get; set; }
diff --git a/AllBase/Model/Result/KJDDBProduct.cs b/AllBase/Model/Result/KJDDBProduct.cs
index d4c99c4..56c501a 100644
--- a/AllBase/Model/Result/KJDDBProduct.cs
+++ b/AllBase/Model/Result/KJDDBProduct.cs
@@ -24,6 +24,8 @@ namespace AllBase.Model.Result
public string product_name { get; set; }
public string product_json { get; set; }
public string size_json { get; set; }
+ public int sku_img_replace_id { get; set; }
+ public string sku_img_replace_base64 { get; set; }
public string main_img { get; set; }
public DateTime add_time { get; set; }
public DateTime mdy_time { get; set; }
diff --git a/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs b/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs
new file mode 100644
index 0000000..8c7dabf
--- /dev/null
+++ b/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.PDDResult
+{
+ public class PDDActivitiInfo
+ {
+ public long? mall_id { get; set; }
+ public List theme_activity_quick_enroll_goods_render_form_list { get; set; }
+ public Dictionary activity_info_map { get; set; }
+ public PictureRenderingItem page_bottom_picture_rendering_element { get; set; }
+ }
+ public class PDDActivitiGoodsRenderFormItem
+ {
+ public long? goods_id { get; set; }
+ public GoodsInfoRenderItem goods_info_render { get; set; }
+ public GoodsPromotionBenefitRenderItem goods_promotion_benefit_render { get; set; }
+ public GoodsPromotionProtocolRenderItem goods_promotion_protocol_render { get; set; }
+ public ActivityPriceRenderItem activity_price_render { get; set; }
+ public List sku_info_render_list { get; set; }
+ public ActivityQuantityRenderItem activity_quantity_render { get; set; }
+ public ActivityMaterialRenderItem activity_material_render { get; set; }
+ public int? order_number { get; set; } //22
+ public GoodsActivityEffectRenderItem goods_activity_effect_render { get; set; }
+ public long? activity_id { get; set; }
+ public GoodsTrafficProtectInfoItem goods_traffic_protect_info { get; set; }
+ public object goods_service_tag_render { get; set; }
+ public object supply_tool_mms_enroll_form_goods_param_items { get; set; }
+ public GoodsExtensionInfoItem goods_extension_info { get; set; }
+ public GoodsShippingConfigRenderItem goods_shipping_config_render { get; set; }
+ }
+
+ public class GoodsShippingConfigRenderItem
+ {
+ public bool? not_default_selection { get; set; } //false,
+ public bool? need_create_cost_template { get; set; } //false,
+ public object cost_template_id { get; set; } //null,
+ public object cost_template_name { get; set; } //null,
+ public object valuation { get; set; } //null,
+ public object delivery_region { get; set; } //null,
+ public object free_shipping_region { get; set; } //null,
+ public object not_free_shipping_region { get; set; } //null,
+ public object not_shipping_region { get; set; } //null
+
+ }
+
+ public class GoodsExtensionInfoItem
+ {
+ public long? goods_id { get; set; }
+ public int? cat_id1 { get; set; }
+ public bool? not_default_selection { get; set; }
+ }
+
+ public class GoodsTrafficProtectInfoItem
+ {
+ public bool? high_sensitive_goods { get; set; } //false,
+ public int? fill_max_cut_price_amount { get; set; } //100
+
+ }
+
+ public class GoodsActivityEffectRenderItem
+ {
+ public object sold_quantity1m { get; set; } //null
+ }
+ public class ActivityMaterialRenderItem
+ {
+ public object activity_goods_image_render { get; set; }
+ }
+
+ public class ActivityQuantityRenderItem
+ {
+ public bool? need_goods_activity_quantity { get; set; } // false,
+ public object min_activity_quantity { get; set; } // null,
+ public object max_activity_quantity { get; set; } // null
+
+ }
+
+ public class SkuInfoRenderItem
+ {
+ public long? sku_id { get; set; } //1788544288237,
+ public string sku_name { get; set; } // "红格子",
+ public int? sku_quantity { get; set; } //100,
+ public int? group_price { get; set; } //5000
+
+ }
+
+ public class ActivityPriceRenderItem
+ {
+ public bool? not_must_check_price_restrict { get; set; } //false
+ public List sku_activity_price_render_dtolist { get; set; }
+ }
+
+ public class SkuActivityPriceRenderDtoItem
+ {
+ public long? sku_id { get; set; } // 1788544288237
+ public string sku_name { get; set; } //"红格子",
+ public int? sku_quantity { get; set; } // 100,
+ public int? group_price { get; set; } // 5000,
+ public int? suggest_price { get; set; } // 3869,
+ public int? gear_rule { get; set; } // 100,
+ public int? filling_sku_price { get; set; } // 3860,
+ public object cur_goods_acty_prc { get; set; } // null
+
+ }
+
+ public class GoodsPromotionProtocolRenderItem
+ {
+ public object need_show_cut_price_compensation { get; set; }
+ public object need_sign_manfan_protocol { get; set; }
+ public quickEnrollManfanGoodsInfoVoItem quick_enroll_manfan_goods_info_vo { get; set; }
+ }
+
+ public class quickEnrollManfanGoodsInfoVoItem
+ {
+ public object need_join_manfan_act { get; set; }
+ public object goods_join_manfan_act_info_content { get; set; }
+ public object protocol_type { get; set; }
+ }
+
+ public class GoodsPromotionBenefitRenderItem
+ {
+ public List
///
///
- public byte[] GetPictureData(Bitmap Bitmap)
+ public static byte[] GetPictureData(Bitmap Bitmap)
{
MemoryStream ms = null;
try
@@ -93,13 +95,13 @@ namespace Work.BLL.Tools
}
}
- public byte[] Base64ChangeBuffer(String imgBase64)
+ public static byte[] Base64ChangeBuffer(String imgBase64)
{
try
{
if (!string.IsNullOrEmpty(imgBase64))
{
- return GetPictureData(ToImage(imgBase64));
+ return GetPictureData(Base64ToImage(imgBase64));
}
return null;
}