修复bug,优化店铺筛选选项
This commit is contained in:
1 parent
aa45b35145
commit
ad325eaec5
15 files changed
+596
-347
No files matched your search
@@ -107,6 +107,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
pbLoadingShop.Visible = true;
|
||||
RefreshShopLogin();
|
||||
pbLoadingShop.Visible = false;
|
||||
}
|
||||
|
||||
private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e)
|
||||
@@ -686,9 +687,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderAfterSale.orderInfo.orderId);
|
||||
orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
|
||||
orderAfterSale.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
|
||||
orderAfterSale.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
|
||||
if (!string.IsNullOrEmpty(orderAfterSale.optimizeWaybillId))
|
||||
orderAfterSale.optimizeWaybillId = "已补发";
|
||||
orderAfterSale.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -737,7 +738,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
if (ov != null)
|
||||
{
|
||||
orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
|
||||
orderAfterSale.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm");
|
||||
orderAfterSale.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -818,12 +819,17 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
refundOrder.province + refundOrder.city + refundOrder.district,
|
||||
BaseClass.StampToDateTime(refundOrder.orderInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
refundOrder.reason,
|
||||
refundOrder.optimizeWaybillId + "\r\n" + refundOrder.optimizeTime,
|
||||
refundOrder.optimizeTime + "\r\n" + refundOrder.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
|
||||
"补发",
|
||||
refundOrder.remark.Trim().IsNullOrEmpty() ? "添加备注" : refundOrder.remark.Trim()
|
||||
);
|
||||
|
||||
dgvData1.Rows[rowIndex].Height = 60;
|
||||
var row = dgvData1.Rows[rowIndex];
|
||||
row.Height = 60;
|
||||
if (refundOrder.optimizeWaybillId.Contains("失败"))
|
||||
row.Cells["colDgv1OptimizeStatus"].Style.ForeColor = Color.Red;
|
||||
else if (!refundOrder.optimizeTime.IsNullOrEmpty() && !refundOrder.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
|
||||
row.Cells["colDgv1OptimizeStatus"].Style.ForeColor = Color.Orange;
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -988,9 +994,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
var ov = optimizeLst.FirstOrDefault(o => o.order_id == evaluationInfo.order_id);
|
||||
evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
|
||||
evaluationInfo.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
|
||||
evaluationInfo.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
|
||||
if (!string.IsNullOrEmpty(evaluationInfo.optimizeWaybillId))
|
||||
evaluationInfo.optimizeWaybillId = "已补发";
|
||||
evaluationInfo.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1039,7 +1045,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
if (ov != null)
|
||||
{
|
||||
evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
|
||||
evaluationInfo.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm");
|
||||
evaluationInfo.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1126,12 +1132,17 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
prodEvaluationInfo.evaluationInfo.buyer.identity.nickname,
|
||||
BaseClass.StampToDateTime(prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
(content + " " + (lblLst == null ? "" : string.Join(" ", lblLst.Select(e => e.labelName)))).Trim(),
|
||||
prodEvaluationInfo.optimizeWaybillId + "\r\n" + prodEvaluationInfo.optimizeTime,
|
||||
prodEvaluationInfo.optimizeTime + "\r\n" + prodEvaluationInfo.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
|
||||
"补发",
|
||||
prodEvaluationInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : prodEvaluationInfo.remark.Trim()
|
||||
);
|
||||
|
||||
dgvData2.Rows[rowIndex].Height = 60;
|
||||
var row = dgvData2.Rows[rowIndex];
|
||||
row.Height = 60;
|
||||
if (prodEvaluationInfo.optimizeWaybillId.Contains("失败"))
|
||||
row.Cells["colDgv2OptimizeStatus"].Style.ForeColor = Color.Red;
|
||||
else if (!prodEvaluationInfo.optimizeTime.IsNullOrEmpty() && !prodEvaluationInfo.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
|
||||
row.Cells["colDgv2OptimizeStatus"].Style.ForeColor = Color.Orange;
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -1342,9 +1353,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderWaybill.orderInfo.orderId);
|
||||
orderWaybill.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
|
||||
orderWaybill.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
|
||||
orderWaybill.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
|
||||
if (!string.IsNullOrEmpty(orderWaybill.optimizeWaybillId))
|
||||
orderWaybill.optimizeWaybillId = "已补发";
|
||||
orderWaybill.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1397,7 +1408,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
if (ov != null)
|
||||
{
|
||||
orderWaybill.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
|
||||
orderWaybill.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm");
|
||||
orderWaybill.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1481,12 +1492,17 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
orderWaybill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "小时" + "\r\n" + "[" + (is24 ? "次日" : "48小时") + "]"),
|
||||
orderWaybill.delivery.deliveryName,
|
||||
orderWaybill.waybillId,
|
||||
orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime,
|
||||
orderWaybill.optimizeTime + "\r\n" + orderWaybill.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
|
||||
"补发",
|
||||
orderWaybill.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderWaybill.remark.Trim()
|
||||
);
|
||||
|
||||
dgvData3.Rows[rowIndex].Height = 60;
|
||||
var row = dgvData3.Rows[rowIndex];
|
||||
row.Height = 60;
|
||||
if (orderWaybill.optimizeWaybillId.Contains("失败"))
|
||||
row.Cells["colDgv3OptimizeStatus"].Style.ForeColor = Color.Red;
|
||||
else if (!orderWaybill.optimizeTime.IsNullOrEmpty() && !orderWaybill.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
|
||||
row.Cells["colDgv3OptimizeStatus"].Style.ForeColor = Color.Orange;
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -1683,9 +1699,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id);
|
||||
linerCgi.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
|
||||
linerCgi.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
|
||||
linerCgi.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
|
||||
if (!string.IsNullOrEmpty(linerCgi.optimizeWaybillId))
|
||||
linerCgi.optimizeWaybillId = "已补发";
|
||||
linerCgi.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1732,7 +1748,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id);
|
||||
linerCgi.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
|
||||
linerCgi.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm");
|
||||
linerCgi.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1815,12 +1831,17 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"),
|
||||
"发货地:" + orderLinerCgiInfo.ship_city + "\r\n" + "收货地:" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city,
|
||||
(orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" + "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时",
|
||||
orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime,
|
||||
orderLinerCgiInfo.optimizeTime + "\r\n" + orderLinerCgiInfo.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
|
||||
"补发",
|
||||
orderLinerCgiInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderLinerCgiInfo.remark.Trim()
|
||||
);
|
||||
|
||||
dgvData4.Rows[rowIndex].Height = 60;
|
||||
var row = dgvData4.Rows[rowIndex];
|
||||
row.Height = 60;
|
||||
if (orderLinerCgiInfo.optimizeWaybillId.Contains("失败"))
|
||||
row.Cells["colDgv4OptimizeStatus"].Style.ForeColor = Color.Red;
|
||||
else if (!orderLinerCgiInfo.optimizeTime.IsNullOrEmpty() && !orderLinerCgiInfo.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
|
||||
row.Cells["colDgv4OptimizeStatus"].Style.ForeColor = Color.Orange;
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -1894,11 +1915,11 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
data += "&waybill_id=" + waybill_id;
|
||||
data += "&delivery_name=" + delivery_name;
|
||||
data += "&optimize_rst=补发成功";
|
||||
data += "&optimize_rst=补发成功" + " " + delivery_id + ":" + waybill_id;
|
||||
}
|
||||
else
|
||||
{
|
||||
data += "&optimize_rst=" + (msg.IsNullOrEmpty() ? "补发失败" : msg);
|
||||
data += "&optimize_rst=" + (msg.IsNullOrEmpty() ? "补发失败" : msg) + " " + delivery_id + ":" + waybill_id;
|
||||
}
|
||||
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
@@ -1926,13 +1947,13 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
|
||||
if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("<code>200</code>"))
|
||||
return "补发失败,还原失败\r\n" + errMsg + " " + msg;
|
||||
return "补发失败,还原失败\r\n" + errMsg + " " + msg + " " + delivery_id + ":" + waybill_id;
|
||||
else
|
||||
return "补发失败\r\n" + errMsg;
|
||||
return "补发状态记录失败\r\n" + errMsg + " " + delivery_id + ":" + waybill_id;
|
||||
}
|
||||
if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("<code>200</code>"))
|
||||
return "补发失败,已还原\r\n" + msg;
|
||||
return "补发成功";
|
||||
return "补发失败,已还原\r\n" + msg + " " + delivery_id + ":" + waybill_id;
|
||||
return "补发成功" + " " + delivery_id + ":" + waybill_id;
|
||||
}
|
||||
|
||||
private void dgvData_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
||||
@@ -2008,6 +2029,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
}
|
||||
var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString());
|
||||
row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst;
|
||||
row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Style.ForeColor = rst.Contains("成功") ? Control.DefaultForeColor : Color.Red;
|
||||
break;
|
||||
}
|
||||
case "备注":
|
||||
|
||||
Reference in new issue
Block a user