优化订单处理

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

@@ -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);
}
}