chfei/KJD_WebService
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

618活动 10%

Browse Source
This commit is contained in:
wule committed 2026-08-24 07:03:47 +08:00
1 parent b949d0a67e
commit 610e75dfce
6 files changed
+111 -58
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/BaseClass.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
public static int VersionCount = 1288;
public static int VersionCount = 1290;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+6 -4
View File
@@ -680,8 +680,6 @@ namespace KJD_Web.BLL.WXXD
var oms_wei_external_procurement_log_list = GetTransitOrderTable(page, page_size, order_no, order_sku_id, out_order_no, pre_allocated_order_no, transfer_warehouse_status, not_count, out count);
if (oms_wei_external_procurement_log_list != null)
{
JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
var data = JsonUtils.SerializeObjectToString(oms_wei_external_procurement_log_list, jsonSetting);
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
@@ -715,6 +713,10 @@ namespace KJD_Web.BLL.WXXD
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
if (orderNo.Contains("3738552208766960384"))
{
}
string sql = "";
count = -1;
@@ -792,11 +794,11 @@ namespace KJD_Web.BLL.WXXD
inbound_time = row["inbound_time"].ParseToNullableString().ParseToDateTimeNullable(),
outbound_time = row["outbound_time"].ParseToNullableString().ParseToDateTimeNullable(),
has_reject = row["has_reject"].ParseToInt(),
blocked_arrival_time = row["blocked_arrival_time"].ParseToNullableString().ParseToDateTimeNullable(),
rejected_time = row["rejected_time"].ParseToNullableString().ParseToDateTimeNullable(),
});
}
return oms_wei_external_procurement_log_list;
}
else
{
KJDService/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs
+8
View File
@@ -63,5 +63,13 @@ namespace KJD_Web.Model.WxModel
/// 申请拒收状态 0未申请 1申请成功 2申请失败
/// </summary>
public int has_reject { get; set; }
/// <summary>
/// 拦截到仓时间
/// </summary>
public DateTime? blocked_arrival_time { get; set; }
/// <summary>
/// 拒收时间
/// </summary>
public DateTime? rejected_time { get; set; }
}
}
TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.Designer.cs
Generated
+64 -46
View File
@@ -32,15 +32,17 @@ namespace TemuKJD.WXForms.ProductForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.ucCheckBox2 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.pnlStock = new System.Windows.Forms.Panel();
this.label10 = new System.Windows.Forms.Label();
this.txtIntervalMin = new System.Windows.Forms.TextBox();
@@ -52,7 +54,6 @@ namespace TemuKJD.WXForms.ProductForms
this.btnStopSearch2 = new DevComponents.DotNetBar.PanelEx();
this.label7 = new System.Windows.Forms.Label();
this.btnSetStock = new DevComponents.DotNetBar.PanelEx();
this.label6 = new System.Windows.Forms.Label();
this.btnCancelActivity = new DevComponents.DotNetBar.PanelEx();
this.label2 = new System.Windows.Forms.Label();
this.txtSkipPriceEnd = new System.Windows.Forms.TextBox();
@@ -186,8 +187,9 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx3.Controls.Add(this.ucCheckBox2);
this.ucGroupBoxEx3.Controls.Add(this.ucCheckBox1);
this.ucGroupBoxEx3.Controls.Add(this.pnlStock);
this.ucGroupBoxEx3.Controls.Add(this.label6);
this.ucGroupBoxEx3.Controls.Add(this.btnCancelActivity);
this.ucGroupBoxEx3.Controls.Add(this.label2);
this.ucGroupBoxEx3.Controls.Add(this.txtSkipPriceEnd);
@@ -204,6 +206,31 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "活动设置";
//
// ucCheckBox2
//
this.ucCheckBox2.AutoSize = true;
this.ucCheckBox2.Checked = true;
this.ucCheckBox2.CheckState = System.Windows.Forms.CheckState.Checked;
this.ucCheckBox2.Location = new System.Drawing.Point(239, 31);
this.ucCheckBox2.Name = "ucCheckBox2";
this.ucCheckBox2.Size = new System.Drawing.Size(147, 21);
this.ucCheckBox2.TabIndex = 896;
this.ucCheckBox2.Text = "限时秒杀频道招商活动";
this.ucCheckBox2.UseVisualStyleBackColor = true;
this.ucCheckBox2.Visible = false;
//
// ucCheckBox1
//
this.ucCheckBox1.AutoSize = true;
this.ucCheckBox1.Checked = true;
this.ucCheckBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.ucCheckBox1.Location = new System.Drawing.Point(25, 31);
this.ucCheckBox1.Name = "ucCheckBox1";
this.ucCheckBox1.Size = new System.Drawing.Size(180, 21);
this.ucCheckBox1.TabIndex = 895;
this.ucCheckBox1.Text = "“清凉季”+“开学季”活动";
this.ucCheckBox1.UseVisualStyleBackColor = true;
//
// pnlStock
//
this.pnlStock.Controls.Add(this.label10);
@@ -352,16 +379,6 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSetStock.Text = "批量设置库存";
this.btnSetStock.Click += new System.EventHandler(this.btnSetStock_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(14, 31);
this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(161, 17);
this.label6.TabIndex = 875;
this.label6.Text = "“清凉季”+“开学季”活动";
//
// btnCancelActivity
//
this.btnCancelActivity.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1061,19 +1078,19 @@ namespace TemuKJD.WXForms.ProductForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle15.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1235,19 +1252,19 @@ namespace TemuKJD.WXForms.ProductForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
dataGridViewCellStyle17.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvSelectProduct.AutoRowNumber = true;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1296,8 +1313,8 @@ namespace TemuKJD.WXForms.ProductForms
//
// colSupplierName
//
dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle19;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
this.colSupplierName.ReadOnly = true;
@@ -1354,8 +1371,8 @@ namespace TemuKJD.WXForms.ProductForms
//
// colProductName
//
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle20;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
this.colProductName.HeaderText = "商品名称";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -1382,8 +1399,8 @@ namespace TemuKJD.WXForms.ProductForms
//
// colStock
//
dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colStock.DefaultCellStyle = dataGridViewCellStyle21;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colStock.DefaultCellStyle = dataGridViewCellStyle7;
this.colStock.HeaderText = "库存";
this.colStock.Name = "colStock";
this.colStock.ReadOnly = true;
@@ -1593,7 +1610,6 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.Label label2;
private DevComponents.DotNetBar.PanelEx btnCancelActivity;
private UserComponent.UcCheckBox chkProdInActivity;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
@@ -1622,5 +1638,7 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.TextBox textBox2;
private UserComponent.UcCheckBox chkSetStockLoop;
private System.Windows.Forms.Label label8;
private UserComponent.UcCheckBox ucCheckBox2;
private UserComponent.UcCheckBox ucCheckBox1;
}
}
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs
Generated
+17 -4
View File
@@ -71,6 +71,7 @@ namespace TemuKJD.WXForms.ProductForms
this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro();
this.上传参数1 = new System.Windows.Forms.TabPage();
this.chkFreightInsurance = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkSameSpecPriceDown = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkLowestPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkUseWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -778,6 +779,7 @@ namespace TemuKJD.WXForms.ProductForms
//
// 上传参数1
//
this.上传参数1.Controls.Add(this.chkFreightInsurance);
this.上传参数1.Controls.Add(this.chkSameSpecPriceDown);
this.上传参数1.Controls.Add(this.chkLowestPriceSku);
this.上传参数1.Controls.Add(this.chkUseWXComplateProd);
@@ -818,6 +820,16 @@ namespace TemuKJD.WXForms.ProductForms
this.上传参数1.Text = "上传参数";
this.上传参数1.UseVisualStyleBackColor = true;
//
// chkFreightInsurance
//
this.chkFreightInsurance.AutoSize = true;
this.chkFreightInsurance.Location = new System.Drawing.Point(573, 94);
this.chkFreightInsurance.Name = "chkFreightInsurance";
this.chkFreightInsurance.Size = new System.Drawing.Size(63, 21);
this.chkFreightInsurance.TabIndex = 922;
this.chkFreightInsurance.Text = "运费险";
this.chkFreightInsurance.UseVisualStyleBackColor = true;
//
// chkSameSpecPriceDown
//
this.chkSameSpecPriceDown.AutoSize = true;
@@ -885,17 +897,17 @@ namespace TemuKJD.WXForms.ProductForms
//
// txtDefaultBestBefore
//
this.txtDefaultBestBefore.Location = new System.Drawing.Point(529, 93);
this.txtDefaultBestBefore.Location = new System.Drawing.Point(527, 93);
this.txtDefaultBestBefore.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtDefaultBestBefore.Name = "txtDefaultBestBefore";
this.txtDefaultBestBefore.Size = new System.Drawing.Size(31, 23);
this.txtDefaultBestBefore.Size = new System.Drawing.Size(25, 23);
this.txtDefaultBestBefore.TabIndex = 903;
this.txtDefaultBestBefore.Text = "90";
//
// chkDefaultBestBefore
//
this.chkDefaultBestBefore.AutoSize = true;
this.chkDefaultBestBefore.Location = new System.Drawing.Point(426, 94);
this.chkDefaultBestBefore.Location = new System.Drawing.Point(424, 94);
this.chkDefaultBestBefore.Name = "chkDefaultBestBefore";
this.chkDefaultBestBefore.Size = new System.Drawing.Size(111, 21);
this.chkDefaultBestBefore.TabIndex = 902;
@@ -964,7 +976,7 @@ namespace TemuKJD.WXForms.ProductForms
// label25
//
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(560, 96);
this.label25.Location = new System.Drawing.Point(552, 96);
this.label25.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(20, 17);
@@ -3477,5 +3489,6 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.TabPage 特殊参数;
private System.Windows.Forms.Label lblSpBrand;
private System.Windows.Forms.ComboBox cmbSpBrandName;
private UserComponent.UcCheckBox chkFreightInsurance;
}
}
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+15 -3
View File
@@ -4212,6 +4212,13 @@ namespace TemuKJD.WXForms.ProductForms
}
Thread.Sleep(Randomx.GetId(100, 300));
var maxSkuSpecCnt = prodInfo.detail.sku.Max(x => x.spec?.Count).ParseToInt();
foreach(var skuTmp in prodInfo.detail.sku.ToList())
{
if (skuTmp.spec?.Count != maxSkuSpecCnt)
prodInfo.detail.sku.Remove(skuTmp);
}
upProdParam.product.info.productSaleAttrs = new List<productSaleAttrParam>();
if (prodInfo.detail.sku == null)
prodInfo.detail.sku = new List<sku_item>();
@@ -5578,11 +5585,16 @@ namespace TemuKJD.WXForms.ProductForms
upProdParam.product.info.brandId = DefaultAdultBrandId.ParseToLong();
}
// 情趣内衣等类目禁止设置运费险
if (upProdParam.product.info.category[1].name == "情趣内衣" ||
upProdParam.product.info.category[1].name == "水果")
//if (upProdParam.product.info.category[1].name == "情趣内衣" ||
// upProdParam.product.info.category[1].name == "水果")
if (chkFreightInsurance.Checked)
{
upProdParam.product.info.extraService.freightInsurance = 0;
upProdParam.product.info.extraService.freightInsurance = 1;
}
else
{
upProdParam.product.info.extraService.freightInsurance = 0;
}
// 假1赔3
if (upProdParam.product.info.category[0].name == "珠宝首饰" || upProdParam.product.info.category[1].name == "时尚饰品")
{