优化订单处理

This commit is contained in:
wule committed 2026-11-04 10:05:52 +08:00
1 parent 85259d8335
commit 8f7e190974
10 files changed
+271 -125

No files matched your search

@@ -341,7 +341,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
while (!MainWindow.Instance.hasReadShop)
{
Thread.Sleep(100);
await Task.Delay(100);
}
BottomMsg = "开始读取订单...";
@@ -404,7 +404,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
data += "&start_time=" + startTime;
data += "&end_time=" + endTime;
}
Thread.Sleep(200);
await Task.Delay(200);
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -438,17 +438,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 读取订单详情
if (string.IsNullOrEmpty(order_ids))
Thread.Sleep(100);
await Task.Delay(100);
List<oms_wei_order_item_info> orderItems = GetOrderItemInfo(order_ids);
// 读取售后单
if (string.IsNullOrEmpty(order_ids))
Thread.Sleep(100);
await Task.Delay(100);
List<oms_wei_refund_info> refunds = GetOrderRefundInfo(order_ids);
// 读订单扩展
if (string.IsNullOrEmpty(order_ids))
Thread.Sleep(100);
await Task.Delay(100);
List<order_item_ext> orderItemExts = GetOrderItemExts(order_ids);
if (string.IsNullOrEmpty(order_ids))
{
@@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
d:DesignHeight="50"
d:DesignWidth="800"
d:DesignWidth="850"
mc:Ignorable="d">
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
@@ -26,6 +26,7 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="20" />
</Grid.ColumnDefinitions>
<TextBox
@@ -213,7 +214,20 @@
<TextBlock
Grid.Column="11"
Margin="10"
Margin="0,0,8,0"
HorizontalAlignment="Right"
Cursor="Hand"
FontSize="20"
FontWeight="Bold"
Foreground="{StaticResource mainColorBrush}"
MouseLeftButtonUp="TextBlock_MouseLeftButtonUp"
Style="{StaticResource TextBlockIcon}"
Text="{StaticResource txt-arrow_sync}"
ToolTip="刷新订单状态" />
<!-- Foreground="{Binding ElementName=b_gift, Path=BorderBrush}" -->
<TextBlock
Grid.Column="12"
Margin="0,0,8,0"
VerticalAlignment="Center"
d:Text="仅退款/退货退款"
Foreground="Gray"
@@ -221,7 +235,7 @@
<Border
x:Name="borderFlag"
Grid.Column="12"
Grid.Column="13"
Width="auto"
Margin="2"
VerticalAlignment="Center"
@@ -31,6 +31,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
/// </summary>
public partial class OrderListRowHeaderCtrl : UserControl
{
public DateTime LastRefreshTime = DateTime.Now;
public OrderListRowHeaderCtrl()
{
InitializeComponent();
@@ -235,5 +237,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
BaseMsgWindow.ShowError("打开工单窗口失败:" + ex.Message);
}
}
}
private async void TextBlock_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
if (!(this.DataContext is oms_wei_order_info order))
return;
if (LastRefreshTime > DateTime.Now.AddSeconds(-5))
{
BaseMsgWindow.ShowAnimateMessage("操作太快了请稍候再点击", "Error", 5);
return;
}
LastRefreshTime = DateTime.Now;
await Task.Run(async () => { await MainWindow.Instance.orderListCtrl.GetOrder(order.order_id); });
}
}
}
@@ -1061,12 +1061,43 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
// 先作废后申请买手退款
// 订单作废接口(作废重拍)
//postman request POST 'http://localhost:8088/oms-api/external_procurement/discardOrder' \
// --header 'Content-Type: application/json' \
// --body '{
// "orderNo":"12334534534",
// "outOrderNo":"12312312"
//}' 成功返回code:0 失败返回code:1
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
var data2 = new JObject();
data2["orderNo"] = orderItem.order_id;
//data2["outOrderNo"] = transitOrder.out_order_no;
data2["outOrderNo"] = transitOrder.order_code;
var dataStr2 = JsonHelper.SerializeObject(data2);
var discardRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
if (discardRst.Contains("\"code\":0") || discardRst.Contains("\"code\":200"))
{
//MainWindow.Instance.orderListCtrl.GetOrder(orderId);
// 修改为在买手退款流程后提示作废信息
}
else
{
var msg = BaseRegex.GetStringJson(ref discardRst, "msg");
if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
return;
}
#region 处理买手售后
if (transitOrder.out_order_no.ParseToString().StartsWith("tb_")) // 淘宝买手售后
{
if (!isSilent)
BaseMsgWindow.ShowError("淘宝买手暂不支持自动售后,请手动申请售后");
BaseMsgWindow.ShowError("淘宝买手暂不支持自动售后,作废后请手动申请售后");
else
transitOrder.refund_status = "淘宝买手暂不支持自动售后,需手动申请售后";
transitOrder.refund_status = "淘宝买手暂不支持自动售后,作废后需手动申请售后";
}
else // 拼多多买手售后
{
@@ -1114,7 +1145,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
pddAfterRst = PDDBuyerOrderReadCtrl.SimPddAfterSale(buyer, order);
});
if (pddAfterRst.Contains("\"after_sales_status\":1") || pddAfterRst.Contains("该订单已全额退款") || pddAfterRst.Contains("订单未付款"))
{
// 保存退款成功状态
@@ -1140,48 +1171,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
}
//订单作废接口(作废重拍)
//postman request POST 'http://localhost:8088/oms-api/external_procurement/discardOrder' \
// --header 'Content-Type: application/json' \
// --body '{
// "orderNo":"12334534534",
// "outOrderNo":"12312312"
//}' 成功返回code:0 失败返回code:1
#endregion
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
var data2 = new JObject();
data2["orderNo"] = orderItem.order_id;
//data2["outOrderNo"] = transitOrder.out_order_no;
data2["outOrderNo"] = transitOrder.order_code;
var dataStr2 = JsonHelper.SerializeObject(data2);
var discardRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
if (discardRst.Contains("\"code\":0") || discardRst.Contains("\"code\":200"))
{
//MainWindow.Instance.orderListCtrl.GetOrder(orderId);
#region 立即更新订单
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == transitOrder.order_code) ?? transitOrder;
transitOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
#endregion
#region 更新拍单余额
StartUp.UpdateBalance();
#endregion
#region 重新过滤订单
OrderListCtrl.InitOrderItemObservableProp(orderItem);
MainWindow.Instance.orderListCtrl.FilterOrders();
if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废成功,请重新拍单");
#endregion
#region 立即更新订单
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == transitOrder.order_code) ?? transitOrder;
transitOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
#endregion
#region 更新拍单余额
StartUp.UpdateBalance();
#endregion
}
else
{
var msg = BaseRegex.GetStringJson(ref discardRst, "msg");
if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
}
#region 重新过滤订单
OrderListCtrl.InitOrderItemObservableProp(orderItem);
MainWindow.Instance.orderListCtrl.FilterOrders();
if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废成功,请重新拍单");
#endregion
}
private void txtWarehouseStatus_MouseEnter(object sender, MouseEventArgs e)
@@ -1327,35 +1334,42 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// transitAfterSaleWindow.ShowDialog();
//}
// 显示状态的按钮,直接返回
if (sender == btnAddEditTransitWarehouseAfterSale)
return;
if (this.DataContext is oms_wei_order_item_info orderItem)
{
// 显示状态的按钮,直接返回
if (sender == btnAddEditTransitWarehouseAfterSale)
return;
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n1;
ShowReturnPackageWindow(orderItem, orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid, isOutWarehouse);
}
}
string warehouse_status = "";
if (orderItem.ItemTransitOrder?.warehouse_status == 3 || orderItem.ItemTransitOrder?.warehouse_status == 1)
warehouse_status = "已到仓";
if (orderItem.ItemTransitOrder?.warehouse_status == 2)
warehouse_status = "已出仓";
else
warehouse_status = "未到仓";
public static void ShowReturnPackageWindow(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info itemTransitOrder, bool isOutWarehouse)
{
string warehouse_status = "";
if (itemTransitOrder?.warehouse_status == 3 || itemTransitOrder?.warehouse_status == 1)
warehouse_status = "已到仓";
if (itemTransitOrder?.warehouse_status == 2)
warehouse_status = "已出仓";
else
warehouse_status = "未到仓";
if (sender == btnAddEditTransitWarehouseAfterSale_n1)
{
string msg = $@"
if (!isOutWarehouse) /* 未出仓 */
{
string msg = $@"
      拒收失败转寄总店({warehouse_status})
说  明:店铺产生售后,拒收失败(物流信息签收3天
     内无退回记录),货物需转寄退回总店。
收  费:(与退货仓退货价格一样)";
if (BaseMsgWindow.ShowConfirm(msg, "拒收失败转寄总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return;
}
else
{
string msg = $@"
if (BaseMsgWindow.ShowConfirm(msg, "拒收失败转寄总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return;
}
else
{
string msg = $@"
      出库拦截退回仓库({warehouse_status})
说  明:拦截成功后货物返回云仓,云仓转寄到总店。
@@ -1363,13 +1377,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
     几率很低,签收需联系用户拒收。
收  费:(与退货仓退货价格一样)";
if (BaseMsgWindow.ShowConfirm(msg, "出库拦截退回仓库", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return;
}
TransitAfterSaleWindow transitAfterSaleWindow = new TransitAfterSaleWindow(orderItem);
transitAfterSaleWindow.ShowDialog();
if (BaseMsgWindow.ShowConfirm(msg, "出库拦截退回仓库", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return;
}
TransitAfterSaleWindow transitAfterSaleWindow = new TransitAfterSaleWindow(orderItem, itemTransitOrder);
transitAfterSaleWindow.ShowDialog();
}
private async void btnAbnormalOrderRebuy_Click(object sender, RoutedEventArgs e)
@@ -2079,7 +2092,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
});
orderItem.ItemTransitExtraOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
//MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
}
}
@@ -26,7 +26,7 @@
BorderBrush="#8087CEEB"
BorderThickness="1"
CornerRadius="10">
<Grid>
<Grid Opacity="{Binding Opacity}">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
@@ -191,7 +191,19 @@ public partial class OrderTransitListDetailCtrl : UserControl
private void btnAddEditTransitWarehouseAfterSale_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
{
var orderItem = transitDetailInfo.oms_wei_order_item_info;
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
if (transitOrder != null)
{
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n1;
OrderListRowItemCtrl.ShowReturnPackageWindow(orderItem, transitOrder, isOutWarehouse);
}
}
}
private void btnTransitExtraPackages_Click(object sender, RoutedEventArgs e)
@@ -32,13 +32,16 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public oms_wei_order_item_info OrderItem { get; set; }
public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info _transitOrder)
{
InitializeComponent();
if (orderItem != null)
OrderItem = orderItem;
}
if (_transitOrder != null)
TransitOrder = _transitOrder;
}
private void mainGrid_Loaded(object sender, RoutedEventArgs e)
{
@@ -57,10 +60,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
{
if (TransitOrder == null)
{
if (OrderItem.ItemTransitOrder != null)
TransitOrder = OrderItem.ItemTransitOrder;
else
TransitOrder = OrderItem.ItemTransitOrderWithVoid;
TransitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
}
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
@@ -84,17 +84,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
}
if (OrderItem.ItemTransitOrderAfterSale != null && OrderItem.ItemTransitOrderAfterSale.order_void_status != 1)
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == TransitOrder.order_code && t.order_void_status != 1);
if (transitAfterSale != null)
{
btnAdd.IsEnabled = false;
this.txtUser.Text = OrderItem.ItemTransitOrderAfterSale.recipient_name;
this.txtMobile.Text = OrderItem.ItemTransitOrderAfterSale.recipient_phone;
this.txtDetailAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_detail_address;
//this.txtAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_province + "/" + OrderItem.ItemTransitOrderAfterSale.refund_city + "/" + OrderItem.ItemTransitOrderAfterSale.refund_county;
this.txtProvince.Text = OrderItem.ItemTransitOrderAfterSale.refund_province;
this.txtCity.Text = OrderItem.ItemTransitOrderAfterSale.refund_city;
this.txtCounty.Text = OrderItem.ItemTransitOrderAfterSale.refund_county;
this.txtUser.Text = transitAfterSale.recipient_name;
this.txtMobile.Text = transitAfterSale.recipient_phone;
this.txtDetailAddress.Text = transitAfterSale.refund_detail_address;
//this.txtAddress.Text = transitAfterSale.refund_province + "/" + transitAfterSale.refund_city + "/" + transitAfterSale.refund_county;
this.txtProvince.Text = transitAfterSale.refund_province;
this.txtCity.Text = transitAfterSale.refund_city;
this.txtCounty.Text = transitAfterSale.refund_county;
}
else
{