删除不合适的仓库 优化订单和售后单读取
This commit is contained in:
1 parent
6f7aa58ac1
commit
13b68fa64e
53 files changed
+14843
-820
No files matched your search
@@ -125,7 +125,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
if (!GlobalConfig.PDDBuyerLoginList.Any(u => u.buyer_name == order.buyerName))
|
||||
return false;
|
||||
if (order.order_time < BaseClass.DateTimeToTimestampSeconds(new DateTime(2026, 6, 25)))
|
||||
if (order.OrderTime < new DateTime(2025, 6, 29))
|
||||
return false;
|
||||
if (isHideNoWxOrderNo && order.ShopOrderIdStr.IsNullOrEmpty())
|
||||
return false;
|
||||
@@ -148,7 +148,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
lstPddBuyerOrderInfoLite = new ObservableCollection<PddBuyerOrderLiteInfo>();
|
||||
foreach (var item in lstPddBuyerOrderInfoLite.ToList())
|
||||
{
|
||||
if (item.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddMonths(-1)))
|
||||
if (item.OrderTime < DateTime.Now.AddMonths(-1))
|
||||
lstPddBuyerOrderInfoLite.Remove(item);
|
||||
}
|
||||
|
||||
@@ -491,7 +491,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
data3 += "&out_order_no=" + out_order_nos;
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
GetHtml.PostUtf8(url3, data3);
|
||||
html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
{
|
||||
//Dispatcher.Invoke(new Action(() =>
|
||||
@@ -531,9 +531,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
void UpdateOrderStatus(PddBuyerOrderLiteInfo o, oms_wei_order_item_info order_item, oms_wei_refund_info refund_item, oms_wei_external_procurement_log transitOrderList)
|
||||
{
|
||||
o.ShopOrderIdStr = order_item.order_id;
|
||||
o.ShopOrderSkuIdStr = order_item.sku_id;
|
||||
o.ShopOrderSkuNameStr = order_item.sku_attr_str;
|
||||
o.ShopOrderIdStr = order_item?.order_id ?? transitOrderList.order_no;
|
||||
o.ShopOrderSkuIdStr = order_item?.sku_id ?? transitOrderList.order_sku_id;
|
||||
o.ShopOrderSkuNameStr = order_item?.sku_attr_str;
|
||||
o.ShopOrderRefundStr = refund_item?.count > 0 ? "店铺售后" : "";
|
||||
o.TransitWarehouseIdStr = transitOrderList?.platform;
|
||||
o.Express1WaybillStr = transitOrderList?.express_1_waybill;
|
||||
@@ -544,6 +544,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
o.PreAllocatedOrderNoStr = transitOrderList?.pre_allocated_order_no.ParseToString();
|
||||
// 更新订单中转取号状态
|
||||
o.sendStatus = (o.TransitOrderStatus + " " + o.ShopOrderRefundStr).Trim();
|
||||
o.TransitCreateTime = transitOrderList?.created_time ?? DateTime.MinValue;
|
||||
}
|
||||
|
||||
void CefReadBuyerOrder(string url, string data)
|
||||
@@ -596,18 +597,22 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
o.outExpressCompanyMsg = o.extra_info.order_hint?.message;
|
||||
|
||||
// 查找店铺订单并更新店铺订单状态
|
||||
var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.order_items.Any(i1 => i1.item_transit_orders.Any(t1 => t1.out_order_no == o.order_sn)));
|
||||
var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.orderItems.Any(i1 => i1.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn)));
|
||||
if (ShopOrder != null)
|
||||
{
|
||||
var order_item = ShopOrder.order_items.FirstOrDefault(oi => oi.item_transit_orders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.item_refund;
|
||||
var order_item = ShopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
|
||||
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == o.order_sn);
|
||||
|
||||
UpdateOrderStatus(o, order_item, refund_item, transit_item);
|
||||
}
|
||||
|
||||
PddBuyerOrderLiteInfo order = null;
|
||||
if (!this.lstPddBuyerOrderInfoLite.Any(or => or.order_sn == o.order_sn))
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
order = this.lstPddBuyerOrderInfoLite.FirstOrDefault(or => or.order_sn == o.order_sn);
|
||||
}));
|
||||
if (order == null)
|
||||
{
|
||||
order = o;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
@@ -617,7 +622,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
order = this.lstPddBuyerOrderInfoLite.FirstOrDefault(or => or.order_sn == o.order_sn);
|
||||
//if (JsonHelper.SerializeObject(order) != JsonHelper.SerializeObject(o))
|
||||
{
|
||||
//if (order.order_status_prompt.Contains("待发货") && !o.order_status_prompt.Contains("待发货"))
|
||||
@@ -702,10 +706,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
SendTransitOrderE57(order);
|
||||
});
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
ShowOrder(order);
|
||||
}));
|
||||
// 数据源绑定,不再需要显示指定显示的状态
|
||||
//Dispatcher.Invoke(new Action(() =>
|
||||
//{
|
||||
// ShowOrder(order);
|
||||
//}));
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
|
||||
}
|
||||
@@ -1146,11 +1151,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var refunds = GetOrderRefundInfo(order_ids);
|
||||
|
||||
// 查找店铺订单并更新店铺订单状态
|
||||
var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.order_items.Any(i1 => i1.item_transit_orders.Any(t1 => t1.out_order_no == buyerOrder.order_sn)));
|
||||
var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.orderItems.Any(i1 => i1.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn)));
|
||||
if (ShopOrder != null)
|
||||
{
|
||||
var order_item = ShopOrder.order_items.FirstOrDefault(oi => oi.item_transit_orders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.item_refund;
|
||||
var order_item = ShopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
|
||||
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == buyerOrder.order_sn);
|
||||
|
||||
UpdateOrderStatus(buyerOrder, order_item, refund_item, transit_item);
|
||||
@@ -1173,27 +1178,24 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
return;
|
||||
//if (resetSendStatus)
|
||||
// order.sendStatus = "";
|
||||
|
||||
// 已取号 有售后 或者没有店铺订单号的订单,不发送
|
||||
if (order.sendStatus == "已取号" || order.sendStatus.ParseToString().Contains("取号成功") ||
|
||||
order.sendStatus.ParseToString().Contains("售后") || order.ShopOrderIdStr.IsNullOrEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!order.outExpressCompanyCode.IsNullOrEmpty() && !order.tracking_number.IsNullOrEmpty())
|
||||
{
|
||||
// 物流单号不为空才更新服务端
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
|
||||
|
||||
// 提交物流信息
|
||||
if (order.sendStatus != "已提交" && order.sendStatus != "提前取号" && order.sendStatus != "已取号")
|
||||
// 处理中, "已取号(更正)", 已取号, 提前取号, 取号失败
|
||||
// 正在处理取号、已取号(包括提前取号更正的订单)、有售后或者没有中转仓(非中转系统订单)的订单,不发送
|
||||
if (order.sendStatus == "处理中" || order.sendStatus == "已取号" || order.sendStatus == "已取号(更正)" ||
|
||||
order.sendStatus.ParseToString().Contains("售后") || order.TransitWarehouseIdStr.IsNullOrEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// 物流单号不为空才更新服务端
|
||||
if (order.outExpressCompanyCode.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果物流不一致,提交物流信息
|
||||
if (order.Express1CompanyStr != order.outExpressCompanyCode || order.Express1WaybillStr != order.tracking_number)
|
||||
{
|
||||
//JObject obj = new JObject();
|
||||
//obj["orderNo"] = order.ShopOrderIdStr;
|
||||
@@ -1224,21 +1226,37 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// order.sendStatus = "已提交";
|
||||
//}
|
||||
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_update_erp_order_express");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&out_order_no=" + order.order_sn;
|
||||
data3 += "&express_1_company=" + order.outExpressCompanyCode; // 物流公司编号
|
||||
data3 += "&express_1_waybil=" + order.tracking_number; // 物流单号
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
GetHtml.PostUtf8(url3, data3);
|
||||
if (html3.Contains("\"code\":200"))
|
||||
//var url3 = BaseClass.Build29WxObjString("order/wx_update_erp_order_express");
|
||||
//var data3 = UserLogin.GetSignaturex();
|
||||
//data3 += "&out_order_no=" + order.order_sn;
|
||||
//data3 += "&express_1_company=" + order.outExpressCompanyCode; // 物流公司编号
|
||||
//data3 += "&express_1_waybil=" + order.tracking_number; // 物流单号
|
||||
//var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
//if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
// html3 = GetHtml.PostUtf8(url3, data3);
|
||||
//if (html3.Contains("\"code\":200"))
|
||||
//{
|
||||
// order.sendStatus = "已提交";
|
||||
//}
|
||||
|
||||
// 修改上游物流单号
|
||||
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
|
||||
JObject obj = new JObject();
|
||||
obj["platform"] = "WEISHOP";
|
||||
obj["outOrderNo"] = order.order_sn; //外采单号
|
||||
obj["outExpressCompany"] = order.outExpressCompanyCode; // 物流公司编号
|
||||
obj["outExpressNo"] = order.tracking_number; // 物流单号
|
||||
obj["orderCode"] = order.tracking_number; //实际就是外采单号
|
||||
var dataStr = JsonHelper.SerializeObject(obj);
|
||||
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
|
||||
if (exportRst.Contains("<code>0</code>") || exportRst.Contains("<code>200</code>"))
|
||||
{
|
||||
order.sendStatus = "已提交";
|
||||
order.sendStatus = "提交物流信息失败";
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (order.sendStatus == "已提交" && order.sendStatus != "提前取号")
|
||||
// 直接取号
|
||||
if (order.sendStatus != "提前取号" && order.sendStatus != "提前取号(旧订单)")
|
||||
{
|
||||
// 立即取号
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/transfer-warehouse/dispatch";
|
||||
@@ -1254,16 +1272,17 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var dispatchRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
|
||||
//<AjaxResult><msg>订单已成功调用鸿浩仓库接口发货</msg><code>200</code></AjaxResult>
|
||||
|
||||
if (dispatchRst.Contains("<code>200</code>"))
|
||||
if (dispatchRst.Contains("<code>0</code>") || dispatchRst.Contains("<code>200</code>"))
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
order.sendStatus = "取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_items.Any(oi => oi.item_transit_orders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.order_items.FirstOrDefault(oi => oi.item_transit_orders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.item_transit_orders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
if (transit != null)
|
||||
{
|
||||
if (transit.transfer_warehouse_status == 0)
|
||||
@@ -1275,11 +1294,17 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
order.sendStatus = "直接取号失败";
|
||||
order.sendStatus = "直接取号失败" + BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
}
|
||||
}
|
||||
else if (order.sendStatus == "提前取号")
|
||||
// 修改提前取号
|
||||
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
|
||||
{
|
||||
if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
{
|
||||
order.sendStatus = "提前取号流程进行中";
|
||||
}
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
|
||||
var data = new JObject();
|
||||
//data["outAmount"] = order.order_amount.ParseToString();
|
||||
@@ -1292,16 +1317,28 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var dataStr2 = JsonHelper.SerializeObject(data);
|
||||
var dispatchRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
|
||||
|
||||
if (dispatchRst.Contains("<code>0</code>"))
|
||||
if (dispatchRst.Contains("<code>0</code>") || dispatchRst.Contains("<code>200</code>"))
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
if (order.OrderTime < new DateTime(2026, 6, 29) /*order.sendStatus == "提前取号(旧订单)"*/)
|
||||
{
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_update_erp_allocated_order_no");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&out_order_no=" + order.order_sn;
|
||||
data3 += "&pre_allocated_order_no=" + 3;
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
html3 = GetHtml.PostUtf8(url3, data3);
|
||||
}
|
||||
|
||||
order.sendStatus = "修改提前取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_items.Any(oi => oi.item_transit_orders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.order_items.FirstOrDefault(oi => oi.item_transit_orders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.item_transit_orders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
if (transit != null)
|
||||
transit.pre_allocated_order_no = 1;
|
||||
}
|
||||
@@ -1309,7 +1346,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
order.sendStatus = "修改提前取号失败";
|
||||
order.sendStatus = "修改提前取号失败" + BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1644,6 +1681,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
filterTxt = txtFilter.Text.Trim();
|
||||
}
|
||||
|
||||
private void btnClose_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible)
|
||||
MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
|
||||
if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1)
|
||||
Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1);
|
||||
else
|
||||
Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1);
|
||||
}
|
||||
}
|
||||
|
||||
public class YkdBuyerOrder
|
||||
|
||||
Reference in new issue
Block a user