diff --git a/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs b/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs index 26a55f1..ffda937 100644 --- a/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs +++ b/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs @@ -388,9 +388,9 @@ namespace TemuKJD.BLL.VDian var outAttr = JsonHelper.SerializeObject(wdAttrList_New); wdAttrList_New = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(wdAttrList)); + int id = 0; foreach (var wdAttr in wdAttrList_New) { - int id = 0; foreach (var atv in wdAttr.attr_values) { id++; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index b559966..2f597d1 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -7245,7 +7245,6 @@ Content-Type: image/jpeg // 获取映射关系 List relationLst = new List(); - PddRelationParam relationData = null; { var url = BaseClass.BuildPDDObjString("product/get_relation"); var data = UserLogin.GetSignaturex(); @@ -7803,14 +7802,6 @@ Content-Type: image/jpeg // sk.multi_price = maxPrice1; // sk.price = maxPrice1 + 100; //} - - var addPriceFakeSkuInfoMinPrice = addPriceFakeSkuInfoLst.Min(s => s.price); - var addPriceFakeSkuInfoMaxPrice = addPriceFakeSkuInfoLst.Max(s => s.price); - relationData = relationLst? - .OrderBy(r => r.price_min.ParseToInt()) - .FirstOrDefault(r => r.price_min.ParseToInt() * 1.08m > addPriceFakeSkuInfoMinPrice && r.price_max.ParseToInt() * 1.08m > addPriceFakeSkuInfoMaxPrice); - if (relationData == null) - return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"转换数据获取价格失败\"}"; } #endregion @@ -7869,17 +7860,6 @@ Content-Type: image/jpeg addPriceSkuInfoLst.Add(skuInfo); } - - if (relationData == null) - { - var addPriceSkuInfoMinPrice = addPriceSkuInfoLst.Min(s => s.price); - var addPriceSkuInfoMaxPrice = addPriceSkuInfoLst.Max(s => s.price); - relationData = relationLst? - .OrderBy(r => r.price_min.ParseToInt()) - .FirstOrDefault(r => r.price_min.ParseToInt() * 1.08m > addPriceSkuInfoMinPrice && r.price_max.ParseToInt() * 1.08m > addPriceSkuInfoMaxPrice); - if (relationData == null) - return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"转换数据获取价格失败\"}"; - } } #endregion @@ -8047,6 +8027,15 @@ Content-Type: image/jpeg } pddApi.Data["sku_list"] = "[" + skuApiString.Trim(',') + "]"; + // 计算转换列表内是否有符合条件的转换商品 + var addPriceSkuInfoMinPrice = addPriceSkuInfoLst.Min(s => s.price); + var addPriceSkuInfoMaxPrice = addPriceSkuInfoLst.Max(s => s.price); + var relationData = relationLst? + .OrderBy(r => r.price_min.ParseToInt()) + .FirstOrDefault(r => r.price_min.ParseToInt() * 1.08m > addPriceSkuInfoMinPrice && r.price_max.ParseToInt() * 1.08m > addPriceSkuInfoMaxPrice); + if (relationData == null) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"转换数据获取价格失败\"}"; + //满两件折扣，todo可通过pdd.goods.cat.rule.get查询具体规则 pddApi.Data["two_pieces_discount"] = 99; diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs index 8b5abb6..4ca7935 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs @@ -80,6 +80,7 @@ namespace TemuKJD.WXForms.TalkForms this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.panel2 = new System.Windows.Forms.Panel(); + this.lblMsg = new System.Windows.Forms.Label(); this.btnRestore = new DevComponents.DotNetBar.PanelEx(); this.txtOrderSnFilter = new System.Windows.Forms.TextBox(); this.btnFilterOrder = new DevComponents.DotNetBar.PanelEx(); @@ -689,6 +690,7 @@ namespace TemuKJD.WXForms.TalkForms // // panel2 // + this.panel2.Controls.Add(this.lblMsg); this.panel2.Controls.Add(this.btnRestore); this.panel2.Controls.Add(this.txtOrderSnFilter); this.panel2.Controls.Add(this.btnFilterOrder); @@ -699,13 +701,22 @@ namespace TemuKJD.WXForms.TalkForms this.panel2.Size = new System.Drawing.Size(1054, 345); this.panel2.TabIndex = 908; // + // lblMsg + // + this.lblMsg.AutoSize = true; + this.lblMsg.Location = new System.Drawing.Point(400, 13); + this.lblMsg.Name = "lblMsg"; + this.lblMsg.Size = new System.Drawing.Size(48, 17); + this.lblMsg.TabIndex = 914; + this.lblMsg.Text = "lblMsg"; + this.lblMsg.Click += new System.EventHandler(this.lblMsg_Click); + // // btnRestore // - this.btnRestore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control; this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRestore.Location = new System.Drawing.Point(318, 312); + this.btnRestore.Location = new System.Drawing.Point(318, 10); this.btnRestore.Name = "btnRestore"; this.btnRestore.Size = new System.Drawing.Size(61, 23); this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -726,20 +737,18 @@ namespace TemuKJD.WXForms.TalkForms // // txtOrderSnFilter // - this.txtOrderSnFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtOrderSnFilter.Location = new System.Drawing.Point(3, 312); + this.txtOrderSnFilter.Location = new System.Drawing.Point(3, 10); this.txtOrderSnFilter.Name = "txtOrderSnFilter"; this.txtOrderSnFilter.Size = new System.Drawing.Size(242, 23); this.txtOrderSnFilter.TabIndex = 903; // // btnFilterOrder // - this.btnFilterOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnFilterOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnFilterOrder.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterOrder.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterOrder.Location = new System.Drawing.Point(251, 312); + this.btnFilterOrder.Location = new System.Drawing.Point(251, 10); this.btnFilterOrder.Name = "btnFilterOrder"; this.btnFilterOrder.Size = new System.Drawing.Size(61, 23); this.btnFilterOrder.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -794,7 +803,7 @@ namespace TemuKJD.WXForms.TalkForms this.colOExpressId, this.colOMsg, this.colSend}); - this.dgvPddBuyerOrder.Location = new System.Drawing.Point(2, 3); + this.dgvPddBuyerOrder.Location = new System.Drawing.Point(2, 42); this.dgvPddBuyerOrder.MultiSelectCheckBox = true; this.dgvPddBuyerOrder.Name = "dgvPddBuyerOrder"; this.dgvPddBuyerOrder.ReadOnly = true; @@ -1235,5 +1244,6 @@ namespace TemuKJD.WXForms.TalkForms private DevComponents.DotNetBar.PanelEx btnRestore; private System.Windows.Forms.TextBox txtOrderSnFilter; private DevComponents.DotNetBar.PanelEx btnFilterOrder; + private System.Windows.Forms.Label lblMsg; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs index bad9195..fd22be4 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs +++ b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs @@ -57,6 +57,7 @@ namespace TemuKJD.WXForms.TalkForms private void ProductListForm_Load(object sender, EventArgs e) { + lblMsg.Text = ""; dtpStartTime.Value = DateTime.Now.Date.AddMonths(-1); dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1); dgvBuyer.AddSelectorColumn("colSelect"); @@ -171,11 +172,9 @@ namespace TemuKJD.WXForms.TalkForms var url1 = url; //if (responseData.Contains("260415-279781076570828")) //{ - //} //if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=3&order_index=0")) //{ - //} if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=3")) //https://mobile.yangkeduo.com/orders.html?type=3 { @@ -248,6 +247,10 @@ namespace TemuKJD.WXForms.TalkForms //{"server_time":1775789489,"orders":[],"extra_info":{}} if (data.Contains("\"orders\":[]")) { + Invoke(new Action(() => + { + lblMsg.Text = "获取空商品列表，退出自动滑动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + })); currentReadBuyer = ""; return; } @@ -903,12 +906,8 @@ namespace TemuKJD.WXForms.TalkForms if (resetSendStatus) order.sendStatus = ""; - if (order.order_sn.Contains("-465578")) - { - - } - if (order.sendStatus == "已发送") + //if (order.sendStatus == "已发货") { return; } @@ -1012,6 +1011,11 @@ namespace TemuKJD.WXForms.TalkForms txtOrderSnFilter.Text = ""; btnFilterOrder_Click(null, null); } + + private void lblMsg_Click(object sender, EventArgs e) + { + + } } public class YkdBuyerOrder