chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化订单操作逻辑

Browse Source
This commit is contained in:
wule committed 2026-11-09 19:00:42 +08:00
1 parent ba6da5e85f
commit 42ed8fc929
4 files changed
+38 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+1 -1
View File
@@ -709,7 +709,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
/// <summary>
///
/// 绑定或者更换代发
/// </summary>
/// <param name="orderItem">要发货的订单物品</param>
/// <param name="targetSupplierId">targetSupplierId 和 targetSupplierName 都为空表示取消代发</param>
29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs
+6 -6
View File
@@ -211,7 +211,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty())
msg = getTransitAfterSaleRst;
BaseMsgWindow.ShowError("中转仓退货订单添加失败，服务端返回 " + msg);
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单添加失败，服务端返回 " + msg);
return;
}
}
@@ -221,7 +221,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode))
{
BaseMsgWindow.ShowError("中转仓退货订单创建失败，售后单获取失败");
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败，售后单获取失败");
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
@@ -337,7 +337,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty())
msg = getTransitAfterSaleRst;
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单添加失败，服务端返回 " + msg, "Error", 5);
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单添加失败，服务端返回 " + msg, "Error", 5);
return;
}
}
@@ -347,7 +347,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode))
{
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败，售后单获取失败", "Error", 5);
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败，售后单获取失败", "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
@@ -363,7 +363,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
string msg = BaseRegex.GetStringXml(ref createReturnOrderRst, "msg");
if (msg.IsNullOrEmpty())
msg = createReturnOrderRst;
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败，服务端返回 " + msg, "Error", 5);
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败，服务端返回 " + msg, "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return;
}
@@ -372,7 +372,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders;
StartUp.UpdateBalance();
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建成功", "Msg", 2);
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);
}
private void btnAddressAnalysis_Click(object sender, RoutedEventArgs e)
AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
+8 -6
View File
@@ -188,15 +188,16 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.VoidPackageBtnVisibility = transitOrder.warehouse_status == 0 && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
transitDetail.RejectPackageBtnVisibility = OrderItem?.ItemOrder?.GetIsWaitBuy() != true && transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3) &&
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
transitDetail.ExtraPackagesBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-4)) &&
transitDetail.ExtraPackagesBtnVisibility = (transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
@@ -450,9 +451,10 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.VoidPackageBtnVisibility = !(transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
// 额外包裹在仓库只能作废，出仓以后才能拦截退回
//transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
// transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitExtraOrder.warehouse_status == 2 &&
transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
Work/_29Tools/BLL/WxApiBLL.cs
+23 -1
View File
@@ -163,7 +163,16 @@ namespace Work._29Tools.BLL
return html;
}
/// <summary>
/// 绑定代发
/// </summary>
/// <param name="shop"></param>
/// <param name="orderId"></param>
/// <param name="spuId"></param>
/// <param name="skuId"></param>
/// <param name="cnt"></param>
/// <param name="supplier_appid"></param>
/// <returns></returns>
public string WxApiDropshipAssign(ShopLoginInfo shop, string orderId, string spuId, string skuId, int cnt, string supplier_appid = null)
{
bool IsRetry = false;
@@ -190,6 +199,13 @@ namespace Work._29Tools.BLL
return html;
}
/// <summary>
/// 取消代发
/// </summary>
/// <param name="shop"></param>
/// <param name="order"></param>
/// <param name="dropShopOrderId"></param>
/// <returns></returns>
public async Task<string> WxApiDropshipCancel(ShopLoginInfo shop, oms_wei_order_info order, string dropShopOrderId)
{
bool IsRetry = false;
@@ -221,6 +237,12 @@ namespace Work._29Tools.BLL
return html;
}
/// <summary>
/// 查询并取消代发
/// </summary>
/// <param name="shop"></param>
/// <param name="order"></param>
/// <returns></returns>
public static async Task<string> WxSearchAndDropshipCancelAsync(ShopLoginInfo shop, oms_wei_order_info order)
{
string orderId = order.order_id;