新增活动 23730 23456 修复情趣类目无法上传问题
This commit is contained in:
wule committed
1 parent
b958280afd
commit
1c7ccd3a03
12 files changed
+1485
-2854
No files matched your search
@@ -201,6 +201,7 @@
|
||||
<Compile Include="Model\Param\PDDCouponParam\PDDActivityMarketingParam.cs" />
|
||||
<Compile Include="Model\Param\PDDCouponParam\PDDCouponParam.cs" />
|
||||
<Compile Include="Model\Param\OutServerGoodsParam.cs" />
|
||||
<Compile Include="Model\Param\PDDProdParam\PDDActivitySubmitParamV2.cs" />
|
||||
<Compile Include="Model\Param\PDDProdParam\PddEditProdStockQuantity.cs" />
|
||||
<Compile Include="Model\Param\ToolsManage\ADSLAccountParam.cs" />
|
||||
<Compile Include="Model\Param\ToolsManage\ProductMappingExportInfo.cs" />
|
||||
@@ -213,6 +214,7 @@
|
||||
<Compile Include="Model\Result\JST\JSTListProductSkuInfo.cs" />
|
||||
<Compile Include="Model\Result\PDDResult\ApiPddGoodsCatRuleInfo.cs" />
|
||||
<Compile Include="Model\Result\PDDResult\PDDActivityResult\ActivityListProdInfo.cs" />
|
||||
<Compile Include="Model\Result\PDDResult\PDDActivityResult\ActEnrollV3GoodsRuleInfo.cs" />
|
||||
<Compile Include="Model\Result\WXResult\WXAddressInfo.cs" />
|
||||
<Compile Include="Model\Result\WXResult\WXClientProductInfoLite.cs" />
|
||||
<Compile Include="Model\Result\WXResult\WXFinderTalentInfo.cs" />
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace AllBase
|
||||
/// <summary>
|
||||
/// 版本ID
|
||||
/// </summary>
|
||||
public static int VersionCount = 959;
|
||||
public static int VersionCount = 962;
|
||||
//public static int VersionCount = 613;
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AllBase.Model.Param.PDDProdParam
|
||||
{
|
||||
public class PDDActivitySubmitParamV2
|
||||
{
|
||||
public enroll_source_ctx_param enroll_source_ctx { get; set; } = new enroll_source_ctx_param();
|
||||
public List<goods_vo_param_v2> goods_volist { get; set; } = new List<goods_vo_param_v2>();
|
||||
public create_protocol_vo_param_v2 create_protocol_vo { get; set; } = new create_protocol_vo_param_v2();
|
||||
public object custom_ability_vo { get; set; } = new object();
|
||||
public long? activity_id { get; set; }
|
||||
public object create_outer_activity_price_ratio_vo { get; set; } = new object();
|
||||
public string behavior_collection_v1_cas_boost_factor { get; set; } = "dXlyaGxldXItNDkwOTQzMTM0LTE3NzU1NDgwNzU2NTE=";
|
||||
}
|
||||
|
||||
public class create_protocol_vo_param_v2
|
||||
{
|
||||
public List<view_confirmed_supply_tool_introduction_volist_param> view_confirmed_supply_tool_introduction_volist { get; set; } = new List<view_confirmed_supply_tool_introduction_volist_param>();
|
||||
|
||||
public List<object> confirmed_protocol_volist = new List<object>();
|
||||
}
|
||||
|
||||
public class view_confirmed_supply_tool_introduction_volist_param
|
||||
{
|
||||
public int? supply_tool_type { get; set; } // 7,
|
||||
public string supply_tool_sn { get; set; } // "P1522OM-1762688085363",
|
||||
public bool? merchant_confirm_outer_ratio { get; set; } // true
|
||||
|
||||
}
|
||||
|
||||
public class goods_vo_param_v2
|
||||
{
|
||||
public long? goods_id { get; set; } // 933674770723
|
||||
public create_activity_price_vo_param_v2 create_activity_price_vo { get; set; } = new create_activity_price_vo_param_v2();
|
||||
public object create_discount_vo { get; set; } = new object();
|
||||
public create_material_vo_param_v2 create_material_vo { get; set; } = new create_material_vo_param_v2();
|
||||
public object create_goods_coupon_vo { get; set; } = new object();
|
||||
public view_confirmed_goods_protocol_vo_param view_confirmed_goods_protocol_vo { get; set; } = new view_confirmed_goods_protocol_vo_param();
|
||||
public object create_finance_cost_vo { get; set; } = new object();
|
||||
public create_goods_promotion_event_vo_param create_goods_promotion_event_vo { get; set; } = new create_goods_promotion_event_vo_param();
|
||||
}
|
||||
|
||||
public class create_goods_promotion_event_vo_param
|
||||
{
|
||||
public List<item_volist_param> item_volist { get; set; } = new List<item_volist_param>();
|
||||
}
|
||||
|
||||
public class item_volist_param
|
||||
{
|
||||
public int? tool_supply_type { get; set; } // 7
|
||||
public string tool_supply_sn { get; set; } // "P1522OM-1762688085363"
|
||||
public string mms_enroll_params { get; set; } // "{\"discount\":\"98\"}"
|
||||
}
|
||||
|
||||
public class create_material_vo_param_v2
|
||||
{
|
||||
public object create_goods_image_vo { get; set; } = new object();
|
||||
public object create_goods_title_vo { get; set; } = new object();
|
||||
}
|
||||
|
||||
public class create_activity_price_vo_param_v2
|
||||
{
|
||||
public object create_time_vo { get; set; } = new object();
|
||||
public object create_quantity_vo { get; set; } = new object();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AllBase.Model.Result.PDDResult.PDDActivityResult
|
||||
{
|
||||
//
|
||||
public class ActEnrollV3GoodsRuleInfo
|
||||
{
|
||||
public long? goods_id { get; set; } // 934516252063
|
||||
public enroll_rule_param_info enroll_rule_param { get; set; }
|
||||
public bool? all_information_filled { get; set; } // true,
|
||||
public object ef_multi_activity_field { get; set; } // null,
|
||||
public object ef_single_price_field { get; set; } // null
|
||||
|
||||
}
|
||||
|
||||
public class mms_enroll_params_info
|
||||
{
|
||||
public string max_discount_threshold { get; set; } // "98"
|
||||
public string min_discount_threshold { get; set; } // "30"
|
||||
public string suggest_discount { get; set; } // "98"
|
||||
public Dictionary<string, int> sku_best_activity_price_map { get; set; } // {"1882087915400":3856,"1882087915401":1280,...}
|
||||
public string effective_activity_price_desc { get;set; }
|
||||
}
|
||||
|
||||
public class enroll_rule_param_info
|
||||
{
|
||||
public enroll_mall_sign_manfan_info enroll_mall_sign_manfan { get; set; }
|
||||
public object enroll_goods_outer_activity_price_rule { get; set; }
|
||||
public enroll_goods_promotion_event_info enroll_goods_promotion_event { get; set; }
|
||||
}
|
||||
|
||||
public class enroll_goods_promotion_event_info
|
||||
{
|
||||
public bool? selected { get; set; }
|
||||
public object supply_tool_activity_introduction_list { get; set; }
|
||||
public List<supply_tool_mms_enroll_form_goods_param_item_info> supply_tool_mms_enroll_form_goods_param_item_list { get; set; }
|
||||
}
|
||||
|
||||
public class supply_tool_mms_enroll_form_goods_param_item_info
|
||||
{
|
||||
public string mms_enroll_params { get; set; } // "{\"max_discount_threshold\":\"98\",\"min_discount_threshold\":\"30\",\"suggest_discount\":\"98\",\"sku_best_activity_price_map\":{\"1882087915400\":3856,\"1882087915401\":1280,\"1882087915402\":1703,\"1882087915403\":2725,\"1882087915396\":1743,\"1882087915397\":1843,\"1882087915398\":1743,\"1882087915399\":1950},\"effective_activity_price_desc\":\"当前价\"}"
|
||||
public int? tool_supply_type { get; set; } // 7
|
||||
public string tool_supply_sn { get; set; } // "P1522OM-1762688085363"
|
||||
|
||||
public mms_enroll_params_info MmsEnrollParamsInfo
|
||||
{
|
||||
get { return JsonHelper.DeserializeJsonToObjectNullable<mms_enroll_params_info>(mms_enroll_params); }
|
||||
}
|
||||
}
|
||||
|
||||
public class enroll_mall_sign_manfan_info
|
||||
{
|
||||
public object need_sign_manfan_protocol { get; set; } // null,
|
||||
public object time_out_degrade_gray { get; set; } // null,
|
||||
public object need_join_manfan_act { get; set; } // null,
|
||||
public object goods_join_manfan_act_info_content { get; set; } // null,
|
||||
public object protocol_type { get; set; } // null
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1346,11 +1346,11 @@ namespace KJD_Web.BLL.BXX
|
||||
//where子句
|
||||
sql += where;
|
||||
|
||||
//sql += " ORDER BY RAND()";
|
||||
//sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
|
||||
sql += " ORDER BY RAND()";
|
||||
sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
|
||||
|
||||
var limit = RandomUtils.GetId(Math.Max(0, count - page_size));
|
||||
sql += " limit " + limit + "," + 5000;
|
||||
//var limit = RandomUtils.GetId(Math.Max(0, count - page_size));
|
||||
//sql += " limit " + limit + "," + 5000;
|
||||
|
||||
dt = mySql.ExecuteDataTable(sql);
|
||||
Thread.Sleep(100);
|
||||
|
||||
+139
-154
@@ -42,9 +42,9 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.chk23730 = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.chkDownNoPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.chk15996 = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.chk21365 = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.txtAddShippingFeeTimes = new System.Windows.Forms.TextBox();
|
||||
this.label12 = new System.Windows.Forms.Label();
|
||||
@@ -102,18 +102,12 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.chkActivity = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.btnUpload = new DevComponents.DotNetBar.PanelEx();
|
||||
this.chk15996 = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.txtTest20981 = new System.Windows.Forms.TextBox();
|
||||
this.btnTest20981 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.chkUseExtCodePrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||
this.dgvActProduct = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -130,6 +124,12 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.colUpdateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.chk23456 = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -185,9 +185,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.Controls.Add(this.chk23456);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.chk23730);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.chkDownNoPrice);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.label1);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.chk15996);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.chk21365);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.txtAddShippingFeeTimes);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.label12);
|
||||
@@ -219,6 +220,17 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.ucGroupBoxEx2.TabStop = false;
|
||||
this.ucGroupBoxEx2.Text = "活动价格配置";
|
||||
//
|
||||
// chk23730
|
||||
//
|
||||
this.chk23730.AutoSize = true;
|
||||
this.chk23730.Location = new System.Drawing.Point(807, 51);
|
||||
this.chk23730.Name = "chk23730";
|
||||
this.chk23730.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk23730.TabIndex = 871;
|
||||
this.chk23730.Text = "23730";
|
||||
this.chk23730.UseVisualStyleBackColor = true;
|
||||
this.chk23730.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged);
|
||||
//
|
||||
// chkDownNoPrice
|
||||
//
|
||||
this.chkDownNoPrice.AutoSize = true;
|
||||
@@ -242,22 +254,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.label1.TabIndex = 851;
|
||||
this.label1.Text = "勾选报名活动";
|
||||
//
|
||||
// chk15996
|
||||
//
|
||||
this.chk15996.AutoSize = true;
|
||||
this.chk15996.Location = new System.Drawing.Point(781, 51);
|
||||
this.chk15996.Name = "chk15996";
|
||||
this.chk15996.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk15996.TabIndex = 682;
|
||||
this.chk15996.Text = "15996";
|
||||
this.chk15996.UseVisualStyleBackColor = true;
|
||||
this.chk15996.Visible = false;
|
||||
this.chk15996.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged);
|
||||
//
|
||||
// chk21365
|
||||
//
|
||||
this.chk21365.AutoSize = true;
|
||||
this.chk21365.Location = new System.Drawing.Point(726, 51);
|
||||
this.chk21365.Location = new System.Drawing.Point(745, 51);
|
||||
this.chk21365.Name = "chk21365";
|
||||
this.chk21365.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk21365.TabIndex = 681;
|
||||
@@ -341,7 +341,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
// chk20981
|
||||
//
|
||||
this.chk20981.AutoSize = true;
|
||||
this.chk20981.Location = new System.Drawing.Point(671, 51);
|
||||
this.chk20981.Location = new System.Drawing.Point(621, 51);
|
||||
this.chk20981.Name = "chk20981";
|
||||
this.chk20981.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk20981.TabIndex = 680;
|
||||
@@ -352,7 +352,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
// chk22347
|
||||
//
|
||||
this.chk22347.AutoSize = true;
|
||||
this.chk22347.Location = new System.Drawing.Point(615, 51);
|
||||
this.chk22347.Location = new System.Drawing.Point(683, 51);
|
||||
this.chk22347.Name = "chk22347";
|
||||
this.chk22347.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk22347.TabIndex = 679;
|
||||
@@ -936,8 +936,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
//
|
||||
// splitContainer2.Panel2
|
||||
//
|
||||
this.splitContainer2.Panel2.Controls.Add(this.chkActivity);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.btnUpload);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.chk15996);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.txtTest20981);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.btnTest20981);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.chkUseExtCodePrice);
|
||||
@@ -1090,41 +1089,17 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.colMessage.Name = "colMessage";
|
||||
this.colMessage.ReadOnly = true;
|
||||
//
|
||||
// chkActivity
|
||||
// chk15996
|
||||
//
|
||||
this.chkActivity.AutoSize = true;
|
||||
this.chkActivity.Location = new System.Drawing.Point(11, 35);
|
||||
this.chkActivity.Name = "chkActivity";
|
||||
this.chkActivity.Size = new System.Drawing.Size(75, 21);
|
||||
this.chkActivity.TabIndex = 856;
|
||||
this.chkActivity.Text = "报名活动";
|
||||
this.chkActivity.UseVisualStyleBackColor = true;
|
||||
this.chkActivity.Visible = false;
|
||||
//
|
||||
// btnUpload
|
||||
//
|
||||
this.btnUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnUpload.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnUpload.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnUpload.Location = new System.Drawing.Point(88, 34);
|
||||
this.btnUpload.Name = "btnUpload";
|
||||
this.btnUpload.Size = new System.Drawing.Size(66, 23);
|
||||
this.btnUpload.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnUpload.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnUpload.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnUpload.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnUpload.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnUpload.Style.GradientAngle = 90;
|
||||
this.btnUpload.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnUpload.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnUpload.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnUpload.TabIndex = 855;
|
||||
this.btnUpload.Text = "模拟上传";
|
||||
this.btnUpload.Visible = false;
|
||||
this.chk15996.AutoSize = true;
|
||||
this.chk15996.Location = new System.Drawing.Point(166, 38);
|
||||
this.chk15996.Name = "chk15996";
|
||||
this.chk15996.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk15996.TabIndex = 682;
|
||||
this.chk15996.Text = "15996";
|
||||
this.chk15996.UseVisualStyleBackColor = true;
|
||||
this.chk15996.Visible = false;
|
||||
this.chk15996.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged);
|
||||
//
|
||||
// txtTest20981
|
||||
//
|
||||
@@ -1168,7 +1143,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.chkUseExtCodePrice.AutoSize = true;
|
||||
this.chkUseExtCodePrice.Checked = true;
|
||||
this.chkUseExtCodePrice.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkUseExtCodePrice.Location = new System.Drawing.Point(174, 35);
|
||||
this.chkUseExtCodePrice.Location = new System.Drawing.Point(13, 38);
|
||||
this.chkUseExtCodePrice.Name = "chkUseExtCodePrice";
|
||||
this.chkUseExtCodePrice.Size = new System.Drawing.Size(147, 21);
|
||||
this.chkUseExtCodePrice.TabIndex = 717;
|
||||
@@ -1235,97 +1210,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.dgvActProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
|
||||
this.dgvActProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll);
|
||||
//
|
||||
// splitContainer4
|
||||
//
|
||||
this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
|
||||
this.splitContainer4.Location = new System.Drawing.Point(0, 0);
|
||||
this.splitContainer4.Name = "splitContainer4";
|
||||
//
|
||||
// splitContainer4.Panel1
|
||||
//
|
||||
this.splitContainer4.Panel1.Controls.Add(this.statusBar);
|
||||
//
|
||||
// splitContainer4.Panel2
|
||||
//
|
||||
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
|
||||
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
|
||||
this.splitContainer4.Size = new System.Drawing.Size(1571, 26);
|
||||
this.splitContainer4.SplitterDistance = 880;
|
||||
this.splitContainer4.TabIndex = 3;
|
||||
//
|
||||
// statusBar
|
||||
//
|
||||
this.statusBar.BackColor = System.Drawing.Color.White;
|
||||
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.statusBar.Location = new System.Drawing.Point(0, 0);
|
||||
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.statusBar.Name = "statusBar";
|
||||
this.statusBar.Size = new System.Drawing.Size(880, 26);
|
||||
this.statusBar.TabIndex = 2;
|
||||
//
|
||||
// btnClear
|
||||
//
|
||||
this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
|
||||
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnClear.Location = new System.Drawing.Point(475, 2);
|
||||
this.btnClear.Name = "btnClear";
|
||||
this.btnClear.Size = new System.Drawing.Size(90, 21);
|
||||
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnClear.Style.GradientAngle = 90;
|
||||
this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnClear.TabIndex = 440;
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// panelEx1
|
||||
//
|
||||
this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.panelEx1.Location = new System.Drawing.Point(568, 2);
|
||||
this.panelEx1.Name = "panelEx1";
|
||||
this.panelEx1.Size = new System.Drawing.Size(115, 21);
|
||||
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.panelEx1.Style.GradientAngle = 90;
|
||||
this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.panelEx1.TabIndex = 668;
|
||||
this.panelEx1.Text = "停止当前操作";
|
||||
this.panelEx1.Visible = false;
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel1.Location = new System.Drawing.Point(699, 552);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(881, 86);
|
||||
this.panel1.TabIndex = 189;
|
||||
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
|
||||
//
|
||||
// colCheck
|
||||
//
|
||||
this.colCheck.Frozen = true;
|
||||
@@ -1453,6 +1337,107 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
this.colOpResult.ReadOnly = true;
|
||||
this.colOpResult.Width = 260;
|
||||
//
|
||||
// splitContainer4
|
||||
//
|
||||
this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
|
||||
this.splitContainer4.Location = new System.Drawing.Point(0, 0);
|
||||
this.splitContainer4.Name = "splitContainer4";
|
||||
//
|
||||
// splitContainer4.Panel1
|
||||
//
|
||||
this.splitContainer4.Panel1.Controls.Add(this.statusBar);
|
||||
//
|
||||
// splitContainer4.Panel2
|
||||
//
|
||||
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
|
||||
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
|
||||
this.splitContainer4.Size = new System.Drawing.Size(1571, 26);
|
||||
this.splitContainer4.SplitterDistance = 880;
|
||||
this.splitContainer4.TabIndex = 3;
|
||||
//
|
||||
// statusBar
|
||||
//
|
||||
this.statusBar.BackColor = System.Drawing.Color.White;
|
||||
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.statusBar.Location = new System.Drawing.Point(0, 0);
|
||||
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.statusBar.Name = "statusBar";
|
||||
this.statusBar.Size = new System.Drawing.Size(880, 26);
|
||||
this.statusBar.TabIndex = 2;
|
||||
//
|
||||
// btnClear
|
||||
//
|
||||
this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
|
||||
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnClear.Location = new System.Drawing.Point(475, 2);
|
||||
this.btnClear.Name = "btnClear";
|
||||
this.btnClear.Size = new System.Drawing.Size(90, 21);
|
||||
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnClear.Style.GradientAngle = 90;
|
||||
this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnClear.TabIndex = 440;
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// panelEx1
|
||||
//
|
||||
this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.panelEx1.Location = new System.Drawing.Point(568, 2);
|
||||
this.panelEx1.Name = "panelEx1";
|
||||
this.panelEx1.Size = new System.Drawing.Size(115, 21);
|
||||
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.panelEx1.Style.GradientAngle = 90;
|
||||
this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.panelEx1.TabIndex = 668;
|
||||
this.panelEx1.Text = "停止当前操作";
|
||||
this.panelEx1.Visible = false;
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel1.Location = new System.Drawing.Point(699, 552);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(881, 86);
|
||||
this.panel1.TabIndex = 189;
|
||||
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
|
||||
//
|
||||
// chk23456
|
||||
//
|
||||
this.chk23456.AutoSize = true;
|
||||
this.chk23456.Location = new System.Drawing.Point(869, 51);
|
||||
this.chk23456.Name = "chk23456";
|
||||
this.chk23456.Size = new System.Drawing.Size(62, 21);
|
||||
this.chk23456.TabIndex = 881;
|
||||
this.chk23456.Text = "23456";
|
||||
this.chk23456.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// PDDAddActivityForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1572,8 +1557,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
private DevComponents.DotNetBar.PanelEx btnGetProd;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private DevComponents.DotNetBar.PanelEx btnUpload;
|
||||
private UserComponent.UcCheckBox chkActivity;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.DateTimePicker dtpStartDay;
|
||||
private DevComponents.DotNetBar.PanelEx panelEx2;
|
||||
@@ -1594,5 +1577,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colUpdateTime;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
|
||||
private UserComponent.UcCheckBox chk23730;
|
||||
private UserComponent.UcCheckBox chk23456;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
+406
-309
File diff suppressed because it is too large.
Load diff
@@ -180,9 +180,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
if (BaseClass.SaLevel == 1)
|
||||
{
|
||||
dgvSelectProduct.Columns["colSkuFakeImg"].Visible = true;
|
||||
cmbTextStyle.Visible = true;
|
||||
cmbTextStyle.Text = pddUploadRule.activitySkuImgTextStyle;
|
||||
}
|
||||
#if DEBUG
|
||||
dgvSelectProduct.Columns["colSkuFakeImg"].Visible = true;
|
||||
cmbTextStyle.Visible = true;
|
||||
cmbTextStyle.Text = pddUploadRule.activitySkuImgTextStyle;
|
||||
#endif
|
||||
|
||||
IsLoadComplate = true;
|
||||
@@ -263,10 +267,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
private void RefreshDbProd()
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter); // 同时刷新下商品分组
|
||||
{
|
||||
// 同时刷新下商品分组
|
||||
PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter);
|
||||
|
||||
// 刷新类目信息
|
||||
GetPddProductCate();
|
||||
Invoke(new Action(() => { cmbSourceType_SelectedIndexChanged(null, null); }));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -288,16 +295,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
}
|
||||
else
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
cmbCateFilter.Items.Clear();
|
||||
var groups = BaseRegex.GetStringJson(ref html, "data");
|
||||
foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||
{
|
||||
cmbCateFilter.Items.Add(item);
|
||||
}
|
||||
cmbCateFilter.Items.Add("");
|
||||
}));
|
||||
//Invoke(new Action(() =>
|
||||
//{
|
||||
// cmbCateFilter1.Items.Clear();
|
||||
// var groups = BaseRegex.GetStringJson(ref html, "data");
|
||||
// foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||
// {
|
||||
// cmbCateFilter1.Items.Add(item);
|
||||
// }
|
||||
// cmbCateFilter1.Items.Add("");
|
||||
//}));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5972,7 +5979,38 @@ Content-Type: image/jpeg
|
||||
data += "&in_ext_codes=" + txtExtCodeFilter.Text;
|
||||
data += "&in_spu_ids=" + txtIdFilter.Text;
|
||||
data += "&in_groups=" + cmbGroupFilter.Text;
|
||||
data += "&in_cates=" + cmbCateFilter.Text;
|
||||
|
||||
var selectCate1 = GlobalConfig.WxCatList.Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
|
||||
var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
|
||||
var selectCate2 = cates2.Where(c => c.level == 2 && (";" + cmbCateFilter2.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
|
||||
var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
|
||||
var selectCate3 = cates3.Where(c => c.level == 3 && (";" + cmbCateFilter3.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
{
|
||||
data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!string.IsNullOrEmpty(cmbCateFilter1.Text) && selectCate1?.Count > 0)
|
||||
data += "&wx_cat_1=" + string.Join(",", selectCate1.Select(c => c.cat_id).ToList());
|
||||
//else if (chkSkipQualification.Checked)
|
||||
//{
|
||||
// // 厂商直采普通店铺不要随特殊商品
|
||||
// data += "&wx_cat_1=" + string.Join(",", GlobalConfig.WxCatList.Where(c => c.level == 1 && !(c.name == "图书" || c.name == "食品饮料" || c.name == "成人用品"))
|
||||
// .Select(c => c.cat_id));
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(cmbCateFilter2.Text) && selectCate2?.Count > 0)
|
||||
data += "&wx_cat_2=" + string.Join(",", selectCate2.Select(c => c.cat_id).ToList());
|
||||
if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && selectCate3?.Count > 0)
|
||||
data += "&wx_cat_3=" + string.Join(",", selectCate3.Select(c => c.cat_id).ToList());
|
||||
}
|
||||
if (selectCate1.Count == 0 && cmbSourceType.Text == "厂商直采" && chkSkipQualification.Checked)
|
||||
{
|
||||
// 厂商直采普通店铺不要随特殊商品
|
||||
data += "&wx_cat_1=" + string.Join(",", GlobalConfig.WxCatList.Where(c => c.level == 1 && !(c.name == "图书" || c.name == "食品饮料" || c.name == "成人用品"))
|
||||
.Select(c => c.cat_id));
|
||||
}
|
||||
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim();
|
||||
if (cmbSourceType.Text.Trim() == "厂商直采")
|
||||
{
|
||||
@@ -5980,13 +6018,6 @@ Content-Type: image/jpeg
|
||||
data += "&is_supplier_prod_ok=" + "已设置";
|
||||
data += "&wx_safe_status=" + "安全商品,未校验";
|
||||
}
|
||||
|
||||
if (cmbSourceType.Text == "厂商直采" && chkSkipQualification.Checked)
|
||||
{
|
||||
// 厂商直采普通店铺不要随特殊商品
|
||||
data += "&wx_cat_1=" + string.Join(",", GlobalConfig.WxCatList.Where(c => c.level == 1 && !(c.name == "图书" || c.name == "食品饮料" || c.name == "成人用品"))
|
||||
.Select(c => c.cat_id));
|
||||
}
|
||||
}));
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
@@ -6216,7 +6247,7 @@ Content-Type: image/jpeg
|
||||
txtIdFilter.Text = "";
|
||||
txtExtCodeFilter.Text = "";
|
||||
cmbGroupFilter.Text = "";
|
||||
cmbCateFilter.Text = "";
|
||||
cmbCateFilter1.Text = "";
|
||||
cmbSourceType.Text = "";
|
||||
int prodCount;
|
||||
GetRandomProductList(out prodCount, 1, 1);
|
||||
@@ -7157,11 +7188,12 @@ Content-Type: image/jpeg
|
||||
}));
|
||||
// 获取类目属性模板
|
||||
var pddApiCatRule = new PddApi(shop);
|
||||
pddApiCatRule.Data["cat_id"] = prodInfo.detail.cat_id;
|
||||
pddApiCatRule.Data["cat_id"] = prodInfo.detail.cat_id; // 23147
|
||||
var catRuleGetRst = pddApiCatRule.PddGoodsCatRuleGet();
|
||||
if (!catRuleGetRst.Contains("\"cat_rule_get_response\""))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJson(ref catRuleGetRst, "error_msg");
|
||||
errMsg += " " + BaseRegex.GetStringJson(ref catRuleGetRst, "sub_msg");
|
||||
if (string.IsNullOrEmpty(errMsg))
|
||||
errMsg = catRuleGetRst;
|
||||
return "类目属性初始化失败 " + errMsg;
|
||||
@@ -7672,7 +7704,7 @@ Content-Type: image/jpeg
|
||||
//if (text1.Length + text2.Length <= 6)
|
||||
// text2 = "专柜品质 " + text2; // 专柜正品
|
||||
//imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, "到手 " + text1 + " " + text2);
|
||||
imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, text1 + " " + text2);
|
||||
imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, text1 + " " + text2, pddUploadRule);
|
||||
//imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha);
|
||||
}
|
||||
else
|
||||
@@ -7721,6 +7753,11 @@ Content-Type: image/jpeg
|
||||
pddApi.Data["is_refundable"] = true;
|
||||
goto retry;
|
||||
}
|
||||
if (upLoadRst.Contains("必选保密发货") && retryTimes >= 0)
|
||||
{
|
||||
pddApi.Data["privacy_delivery"] = 1;
|
||||
goto retry;
|
||||
}
|
||||
if (!upLoadRst.Contains("goods_add_response"))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJson(ref upLoadRst, "error_msg");
|
||||
@@ -8039,7 +8076,7 @@ Content-Type: image/jpeg
|
||||
//foreach (var spec_prop in prodInfo.property.sku_properties) ...
|
||||
}
|
||||
|
||||
public static string PddGetImgBase64ForApi(out string errorMsg, string img_url, Image fakeImg = null, Image imgUp = null, float alpha = 0.05f, string text = "", int imgWidth = 0, int imgHeight = 0)
|
||||
public static string PddGetImgBase64ForApi(out string errorMsg, string img_url, Image fakeImg = null, Image imgUp = null, float alpha = 0.05f, string text = "", PddUploadRule uploadRule = null, int imgWidth = 0, int imgHeight = 0)
|
||||
{
|
||||
errorMsg = "";
|
||||
string imgBase64 = "";
|
||||
@@ -8150,7 +8187,8 @@ Content-Type: image/jpeg
|
||||
var deltaX = 180 * imageBg.Width / 800;
|
||||
var colors = new List<Color> { Color.Red, Color.DarkRed, Color.Green, Color.LightSeaGreen, Color.DarkOrange, Color.Aqua, Color.DeepSkyBlue, Color.Blue, Color.Magenta };
|
||||
var backColors = new List<Color> { Color.Black, Color.DarkBlue, Color.Purple, Color.White, Color.LightYellow, Color.SkyBlue };
|
||||
//colors = new List<Color> { Color.Red, Color.Blue, Color.Green, Color.DarkBlue, Color.DarkOrange, Color.DarkRed };
|
||||
if (uploadRule?.activitySkuImgTextStyle == "双色字体")
|
||||
colors = new List<Color> { Color.Red, Color.Blue, Color.Green, Color.DarkBlue, Color.DarkOrange, Color.DarkRed };
|
||||
var line = 0;
|
||||
var textCount = 0;
|
||||
foreach (var t in text)
|
||||
@@ -8228,10 +8266,12 @@ Content-Type: image/jpeg
|
||||
rectF = new RectangleF(deltaX, yPos, px, py);
|
||||
g.DrawString(text1.Trim(), font, textBrush, rectF);
|
||||
|
||||
//break;
|
||||
if (uploadRule?.activitySkuImgTextStyle == "双色字体")
|
||||
break;
|
||||
}
|
||||
|
||||
//break;
|
||||
if (uploadRule?.activitySkuImgTextStyle == "双色字体")
|
||||
break;
|
||||
}
|
||||
|
||||
//font = new Font("微软雅黑", fontSize, FontStyle.Regular);
|
||||
@@ -8387,6 +8427,125 @@ Content-Type: image/jpeg
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbTextStyle_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
pddUploadRule.activitySkuImgTextStyle = cmbTextStyle.Text;
|
||||
}
|
||||
|
||||
private void label8_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void label20_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public string pdd_product_cates = "";
|
||||
void fillPddCate()
|
||||
{
|
||||
cmbCateFilter1.Items.Clear();
|
||||
cmbCateFilter2.Items.Clear();
|
||||
cmbCateFilter3.Items.Clear();
|
||||
cmbCateFilter1.Text = "";
|
||||
cmbCateFilter2.Text = "";
|
||||
cmbCateFilter3.Text = "";
|
||||
foreach (var item in pdd_product_cates.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||
{
|
||||
cmbCateFilter1.Items.Add(item);
|
||||
}
|
||||
cmbCateFilter1.Items.Add("");
|
||||
}
|
||||
|
||||
void fillWxCate()
|
||||
{
|
||||
cmbCateFilter1.Items.Clear();
|
||||
cmbCateFilter2.Items.Clear();
|
||||
cmbCateFilter3.Items.Clear();
|
||||
cmbCateFilter1.Text = "";
|
||||
cmbCateFilter2.Text = "";
|
||||
cmbCateFilter3.Text = "";
|
||||
foreach (var cate in GlobalConfig.WxCatList.Where(c => c.level == 1).ToList())
|
||||
{
|
||||
cmbCateFilter1.Items.Add(cate.name);
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
fillPddCate();
|
||||
else
|
||||
fillWxCate();
|
||||
}
|
||||
|
||||
private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void cmbCateFilter2_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void cmbCateFilter3_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void cmbCateFilter1_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
return;
|
||||
|
||||
cmbCateFilter2.Text = "";
|
||||
cmbCateFilter2.Items.Clear();
|
||||
cmbCateFilter3.Text = "";
|
||||
cmbCateFilter3.Items.Clear();
|
||||
var selectCate1 = GlobalConfig.WxCatList
|
||||
.Where(c => c.level == 1 && (cmbCateFilter1.Text.Trim() == cmbCateFilter1.DefaultText || (";" + cmbCateFilter1.Text.Trim() + ";")
|
||||
.Contains(";" + c.name + ";"))).ToList();
|
||||
var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
|
||||
//foreach (var cate2 in cates2)
|
||||
//{
|
||||
// cmbCat2.Items.Add(cate2.name);
|
||||
//}
|
||||
cmbCateFilter2.Items.AddRange(cates2.Select(c => c.name).ToArray());
|
||||
}
|
||||
|
||||
private void cmbCateFilter2_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
return;
|
||||
|
||||
cmbCateFilter3.Text = "";
|
||||
cmbCateFilter3.Items.Clear();
|
||||
var selectCate1 = GlobalConfig.WxCatList
|
||||
.Where(c => c.level == 1 && (cmbCateFilter1.Text.Trim() == cmbCateFilter1.DefaultText || (";" + cmbCateFilter1.Text.Trim() + ";")
|
||||
.Contains(";" + c.name + ";"))).ToList();
|
||||
var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
|
||||
var selectCate2 = cates2
|
||||
.Where(c => c.level == 2 && (cmbCateFilter2.Text.Trim() == cmbCateFilter1.DefaultText || (";" + cmbCateFilter2.Text.Trim() + ";")
|
||||
.Contains(c.name))).ToList();
|
||||
var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
|
||||
//foreach (var cate3 in cates3)
|
||||
//{
|
||||
// cmbCat3.Items.Add(cate3.name);
|
||||
//}
|
||||
cmbCateFilter3.Items.AddRange(cates3.Select(c => c.name).ToArray());
|
||||
}
|
||||
|
||||
private void cmbCateFilter3_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
//var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCat1.Text.Trim());
|
||||
//var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList();
|
||||
//var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCat1.Text.Trim());
|
||||
//var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList();
|
||||
//var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCat1.Text.Trim());
|
||||
}
|
||||
}
|
||||
|
||||
public class AddPriceRule
|
||||
@@ -8454,5 +8613,7 @@ Content-Type: image/jpeg
|
||||
public bool sign22347 { get; set; }
|
||||
public bool sign15996 { get; set; }
|
||||
public bool sign21365 { get; set; }
|
||||
|
||||
public string activitySkuImgTextStyle { get; set; } = "双色字体";
|
||||
}
|
||||
}
|
||||
@@ -236,12 +236,12 @@ namespace TemuKJD.UserComponent
|
||||
|
||||
// 计算宽度
|
||||
int maxItemWidth = 0;
|
||||
//for (int index = 0; index < checkedListBox.Items.Count; index++)
|
||||
//{
|
||||
// var wth = TextRenderer.MeasureText(checkedListBox.Items[index].ToString(), checkedListBox.Font).Width + 20;
|
||||
// if (wth > maxItemWidth)
|
||||
// maxItemWidth = wth;
|
||||
//}
|
||||
for (int index = 0; index < checkedListBox.Items.Count; index++)
|
||||
{
|
||||
var wth = TextRenderer.MeasureText(checkedListBox.Items[index].ToString(), checkedListBox.Font).Width + 40;
|
||||
if (wth > maxItemWidth)
|
||||
maxItemWidth = wth;
|
||||
}
|
||||
|
||||
checkedListBox.SendToBack();
|
||||
checkedListBox.Visible = true;
|
||||
|
||||
+6
-6
@@ -404,7 +404,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
this.cmbCat3.DropDownWidth = 1;
|
||||
this.cmbCat3.FormattingEnabled = true;
|
||||
this.cmbCat3.IntegralHeight = false;
|
||||
this.cmbCat3.Location = new System.Drawing.Point(733, 7);
|
||||
this.cmbCat3.Location = new System.Drawing.Point(733, 5);
|
||||
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.cmbCat3.Name = "cmbCat3";
|
||||
this.cmbCat3.Size = new System.Drawing.Size(151, 25);
|
||||
@@ -432,7 +432,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
this.cmbCat2.DropDownWidth = 1;
|
||||
this.cmbCat2.FormattingEnabled = true;
|
||||
this.cmbCat2.IntegralHeight = false;
|
||||
this.cmbCat2.Location = new System.Drawing.Point(525, 7);
|
||||
this.cmbCat2.Location = new System.Drawing.Point(525, 5);
|
||||
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.cmbCat2.Name = "cmbCat2";
|
||||
this.cmbCat2.Size = new System.Drawing.Size(151, 25);
|
||||
@@ -460,7 +460,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
this.cmbCat1.DropDownWidth = 1;
|
||||
this.cmbCat1.FormattingEnabled = true;
|
||||
this.cmbCat1.IntegralHeight = false;
|
||||
this.cmbCat1.Location = new System.Drawing.Point(298, 7);
|
||||
this.cmbCat1.Location = new System.Drawing.Point(298, 5);
|
||||
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.cmbCat1.Name = "cmbCat1";
|
||||
this.cmbCat1.Size = new System.Drawing.Size(151, 25);
|
||||
@@ -520,7 +520,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
"安全+未校验",
|
||||
"安全商品",
|
||||
"未校验"});
|
||||
this.cmbWxSafe.Location = new System.Drawing.Point(71, 42);
|
||||
this.cmbWxSafe.Location = new System.Drawing.Point(71, 40);
|
||||
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.cmbWxSafe.Name = "cmbWxSafe";
|
||||
this.cmbWxSafe.Size = new System.Drawing.Size(151, 25);
|
||||
@@ -543,7 +543,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cmbGroupFilter.FormattingEnabled = true;
|
||||
this.cmbGroupFilter.Location = new System.Drawing.Point(934, 5);
|
||||
this.cmbGroupFilter.Location = new System.Drawing.Point(934, 7);
|
||||
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.cmbGroupFilter.Name = "cmbGroupFilter";
|
||||
this.cmbGroupFilter.Size = new System.Drawing.Size(151, 25);
|
||||
@@ -564,7 +564,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
"机会商品",
|
||||
"以图搜品",
|
||||
"外部数据"});
|
||||
this.cmbSourceType.Location = new System.Drawing.Point(733, 42);
|
||||
this.cmbSourceType.Location = new System.Drawing.Point(733, 40);
|
||||
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.cmbSourceType.Name = "cmbSourceType";
|
||||
this.cmbSourceType.Size = new System.Drawing.Size(151, 25);
|
||||
|
||||
@@ -517,7 +517,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
|
||||
private void cmbCat1_MultiSelectChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采")
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
return;
|
||||
|
||||
cmbCat2.Text = "";
|
||||
@@ -535,7 +535,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
|
||||
private void cmbCat2_MultiSelectChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采")
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
return;
|
||||
|
||||
cmbCat3.Text = "";
|
||||
|
||||
Reference in new issue
Block a user