优化店铺优化功能
This commit is contained in:
1 parent
b5d8818485
commit
5e0a54a8ba
3 files changed
+39
-25
No files matched your search
@@ -27,7 +27,7 @@ namespace AllBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int VersionCount = 1012;
|
public static int VersionCount = 1013;
|
||||||
//public static int VersionCount = 613;
|
//public static int VersionCount = 613;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
+11
-11
@@ -772,7 +772,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"",
|
"",
|
||||||
"是",
|
"是",
|
||||||
"否"});
|
"否"});
|
||||||
this.cmbPddRelation.Location = new System.Drawing.Point(743, 7);
|
this.cmbPddRelation.Location = new System.Drawing.Point(743, 5);
|
||||||
this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbPddRelation.Name = "cmbPddRelation";
|
this.cmbPddRelation.Name = "cmbPddRelation";
|
||||||
this.cmbPddRelation.Size = new System.Drawing.Size(47, 25);
|
this.cmbPddRelation.Size = new System.Drawing.Size(47, 25);
|
||||||
@@ -827,7 +827,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbCat2.FormattingEnabled = true;
|
this.cmbCat2.FormattingEnabled = true;
|
||||||
this.cmbCat2.Location = new System.Drawing.Point(278, 75);
|
this.cmbCat2.Location = new System.Drawing.Point(278, 77);
|
||||||
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbCat2.Name = "cmbCat2";
|
this.cmbCat2.Name = "cmbCat2";
|
||||||
this.cmbCat2.Size = new System.Drawing.Size(46, 25);
|
this.cmbCat2.Size = new System.Drawing.Size(46, 25);
|
||||||
@@ -912,7 +912,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"机会商品",
|
"机会商品",
|
||||||
"以图搜品",
|
"以图搜品",
|
||||||
"外部数据"});
|
"外部数据"});
|
||||||
this.cmbSourceType.Location = new System.Drawing.Point(278, 40);
|
this.cmbSourceType.Location = new System.Drawing.Point(278, 42);
|
||||||
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbSourceType.Name = "cmbSourceType";
|
this.cmbSourceType.Name = "cmbSourceType";
|
||||||
this.cmbSourceType.Size = new System.Drawing.Size(46, 25);
|
this.cmbSourceType.Size = new System.Drawing.Size(46, 25);
|
||||||
@@ -958,7 +958,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"",
|
"",
|
||||||
"是",
|
"是",
|
||||||
"否"});
|
"否"});
|
||||||
this.cmbWxCat.Location = new System.Drawing.Point(622, 5);
|
this.cmbWxCat.Location = new System.Drawing.Point(622, 7);
|
||||||
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbWxCat.Name = "cmbWxCat";
|
this.cmbWxCat.Name = "cmbWxCat";
|
||||||
this.cmbWxCat.Size = new System.Drawing.Size(47, 25);
|
this.cmbWxCat.Size = new System.Drawing.Size(47, 25);
|
||||||
@@ -980,7 +980,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.cmbSort.Items.AddRange(new object[] {
|
this.cmbSort.Items.AddRange(new object[] {
|
||||||
"入库时间",
|
"入库时间",
|
||||||
"认领总数"});
|
"认领总数"});
|
||||||
this.cmbSort.Location = new System.Drawing.Point(381, 40);
|
this.cmbSort.Location = new System.Drawing.Point(381, 42);
|
||||||
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbSort.Name = "cmbSort";
|
this.cmbSort.Name = "cmbSort";
|
||||||
this.cmbSort.Size = new System.Drawing.Size(46, 25);
|
this.cmbSort.Size = new System.Drawing.Size(46, 25);
|
||||||
@@ -1056,7 +1056,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbGroupFilter.FormattingEnabled = true;
|
this.cmbGroupFilter.FormattingEnabled = true;
|
||||||
this.cmbGroupFilter.Location = new System.Drawing.Point(175, 40);
|
this.cmbGroupFilter.Location = new System.Drawing.Point(175, 42);
|
||||||
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbGroupFilter.Name = "cmbGroupFilter";
|
this.cmbGroupFilter.Name = "cmbGroupFilter";
|
||||||
this.cmbGroupFilter.Size = new System.Drawing.Size(46, 25);
|
this.cmbGroupFilter.Size = new System.Drawing.Size(46, 25);
|
||||||
@@ -1071,7 +1071,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"是",
|
"是",
|
||||||
"否",
|
"否",
|
||||||
"导出未拉回"});
|
"导出未拉回"});
|
||||||
this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 40);
|
this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 42);
|
||||||
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbExportToOutServer.Name = "cmbExportToOutServer";
|
this.cmbExportToOutServer.Name = "cmbExportToOutServer";
|
||||||
this.cmbExportToOutServer.Size = new System.Drawing.Size(47, 25);
|
this.cmbExportToOutServer.Size = new System.Drawing.Size(47, 25);
|
||||||
@@ -1107,7 +1107,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"安全商品",
|
"安全商品",
|
||||||
"违规商品",
|
"违规商品",
|
||||||
"未校验"});
|
"未校验"});
|
||||||
this.cmbWxSafe.Location = new System.Drawing.Point(501, 40);
|
this.cmbWxSafe.Location = new System.Drawing.Point(501, 42);
|
||||||
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbWxSafe.Name = "cmbWxSafe";
|
this.cmbWxSafe.Name = "cmbWxSafe";
|
||||||
this.cmbWxSafe.Size = new System.Drawing.Size(47, 25);
|
this.cmbWxSafe.Size = new System.Drawing.Size(47, 25);
|
||||||
@@ -1149,7 +1149,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbCat1.FormattingEnabled = true;
|
this.cmbCat1.FormattingEnabled = true;
|
||||||
this.cmbCat1.Location = new System.Drawing.Point(175, 75);
|
this.cmbCat1.Location = new System.Drawing.Point(175, 77);
|
||||||
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbCat1.Name = "cmbCat1";
|
this.cmbCat1.Name = "cmbCat1";
|
||||||
this.cmbCat1.Size = new System.Drawing.Size(46, 25);
|
this.cmbCat1.Size = new System.Drawing.Size(46, 25);
|
||||||
@@ -1171,7 +1171,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbCat3.FormattingEnabled = true;
|
this.cmbCat3.FormattingEnabled = true;
|
||||||
this.cmbCat3.Location = new System.Drawing.Point(381, 75);
|
this.cmbCat3.Location = new System.Drawing.Point(381, 77);
|
||||||
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbCat3.Name = "cmbCat3";
|
this.cmbCat3.Name = "cmbCat3";
|
||||||
this.cmbCat3.Size = new System.Drawing.Size(46, 25);
|
this.cmbCat3.Size = new System.Drawing.Size(46, 25);
|
||||||
@@ -1268,7 +1268,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"是",
|
"是",
|
||||||
"否",
|
"否",
|
||||||
"修复回传未拉回"});
|
"修复回传未拉回"});
|
||||||
this.cmbHasReturn.Location = new System.Drawing.Point(743, 40);
|
this.cmbHasReturn.Location = new System.Drawing.Point(743, 42);
|
||||||
this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbHasReturn.Name = "cmbHasReturn";
|
this.cmbHasReturn.Name = "cmbHasReturn";
|
||||||
this.cmbHasReturn.Size = new System.Drawing.Size(47, 25);
|
this.cmbHasReturn.Size = new System.Drawing.Size(47, 25);
|
||||||
|
|||||||
@@ -799,7 +799,11 @@ namespace TemuKJD.WXForms.ShopForms
|
|||||||
{
|
{
|
||||||
var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
|
var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
|
||||||
if (shopRow != null)
|
if (shopRow != null)
|
||||||
shopRow.Cells["colMessage"].Value = "获取物流时效失败" + error;
|
{
|
||||||
|
shopRow.Cells["colMessage"].Value = "获取揽收时效失败" + error;
|
||||||
|
//if(error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
|
||||||
|
// shopRow.Cells["colMessage"].Value = "店铺无评分";
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -868,14 +872,21 @@ namespace TemuKJD.WXForms.ShopForms
|
|||||||
orderWayBill.shopId = shop.ShopId;
|
orderWayBill.shopId = shop.ShopId;
|
||||||
orderWayBill.shopName = shop.ShopAccount;
|
orderWayBill.shopName = shop.ShopAccount;
|
||||||
|
|
||||||
// 24小时揽收率截至第二天
|
if (!orderWayBill.realPickupTime.ParseToInt().IsNullOrZero())
|
||||||
if (is24 && BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()).Date <= BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).Date.AddDays(1))
|
{
|
||||||
continue;
|
// 24小时揽收率截至第二天
|
||||||
// 48小时揽收率按48小时算
|
if (is24 && BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()).Date <= BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).Date.AddDays(1))
|
||||||
if (!is24 && BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()) <= BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).AddDays(2))
|
continue;
|
||||||
continue;
|
// 48小时揽收率按48小时算
|
||||||
|
if (!is24 && BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()) <= BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).AddDays(2))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
lstWxOptimizeOrderWayBillInfo.Add(orderWayBill);
|
}
|
||||||
|
|
||||||
|
lstWxOptimizeOrderWayBillInfo.Add(orderWayBill);
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
var rowIndex = this.dgvData3.Rows.Add(
|
var rowIndex = this.dgvData3.Rows.Add(
|
||||||
@@ -893,9 +904,8 @@ namespace TemuKJD.WXForms.ShopForms
|
|||||||
orderWayBill.orderInfo.orderId + "\r\n" + orderWayBill.waybillId,
|
orderWayBill.orderInfo.orderId + "\r\n" + orderWayBill.waybillId,
|
||||||
orderWayBill.delivery.deliveryName,
|
orderWayBill.delivery.deliveryName,
|
||||||
BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
|
BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
|
orderWayBill.realPickupTime.ParseToInt().IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
(BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()) -
|
(orderWayBill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : (new TimeSpan(orderWayBill.pickupDuration.ParseToLong()).TotalHours.ToString("f2") + "小时" + "\r\n")) + "[" + (is24 ? "次日" : "48小时") + "]"
|
||||||
BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt())).TotalHours.ToString("f2") + "小时" + "\r\n[" + (is24 ? "次日" : "48小时") + "]"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
dgvData3.Rows[rowIndex].Height = 60;
|
dgvData3.Rows[rowIndex].Height = 60;
|
||||||
@@ -943,7 +953,11 @@ namespace TemuKJD.WXForms.ShopForms
|
|||||||
{
|
{
|
||||||
var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
|
var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
|
||||||
if (shopRow != null)
|
if (shopRow != null)
|
||||||
shopRow.Cells["colMessage"].Value = "获取物流时效失败" + error;
|
{
|
||||||
|
shopRow.Cells["colMessage"].Value = "获取配送时效失败" + error;
|
||||||
|
//if(error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
|
||||||
|
// shopRow.Cells["colMessage"].Value = "店铺无评分";
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -1000,7 +1014,7 @@ namespace TemuKJD.WXForms.ShopForms
|
|||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
this.pictureBox4.Visible = true;
|
this.pictureBox4.Visible = true;
|
||||||
this.statusBar.lblTaskStatus.Text = "正在查询揽收不达标,店铺:" + shop.ShopAccount + " " + page + "/" + totalPage;
|
this.statusBar.lblTaskStatus.Text = "正在查询配送不达标,店铺:" + shop.ShopAccount + " " + page + "/" + totalPage;
|
||||||
}));
|
}));
|
||||||
foreach (JObject refundOrderObj in wayBillObjs["list"])
|
foreach (JObject refundOrderObj in wayBillObjs["list"])
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user