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-08-18 21:14:00 +08:00
1 parent 3a07409f5f
commit e4e8f7166c
9 files changed
+489 -225
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_order_info.cs
+8 -1
View File
@@ -369,7 +369,14 @@ namespace AllBase.Model.DBModel
public string OutExpressNoStr
{
get { return this.out_express_no + (this.out_shipped != 2 ? "" : " ×"); }
get
{
if (order_id == "3738523900304581376")
{
}
return this.out_express_no + ((this.out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no)) ? "" : " ×");
}
set { }
}
public SolidColorBrush OutExpressNoBrush
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+47 -22
View File
@@ -215,12 +215,17 @@ namespace AllBase.Model.DBModel
{
get { return this.GetValue(x => x.PddBuyerAfterSale); }
set { this.SetValue(x => x.PddBuyerAfterSale, value); }
}
public string PddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
}
}
public string PddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
}
public string DirectPddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); }
}
public void SetTransitOrder()
{
@@ -273,9 +278,20 @@ namespace AllBase.Model.DBModel
AddEditTransitWarehouseRejectStr = "";
}
if (order_id == "3738396781943865344")
{
}
// 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加";
if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 1)
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
AddEditTransitWarehouseAfterSaleStr = "";
}
// 退货退款的，不能中转仓退回。如果是退到退货仓，则退货仓流程，否则店家自行收货退回总店。
if (!RefundAddressStr.ParseToString().Trim().IsNullOrEmpty() || this.ItemRefund?.type != "REFUND")
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
AddEditTransitWarehouseAfterSaleStr = "";
@@ -283,10 +299,6 @@ namespace AllBase.Model.DBModel
if (this.ItemTransitOrderAfterSale != null)
TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-');
if (order_id == "3738382691615546112")
{
}
AddEditTransitWarehouseReturnOrderStr = "";
if (ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)
{
@@ -296,8 +308,10 @@ namespace AllBase.Model.DBModel
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
}
// 买手退货地址
// 云仓买手退货地址
this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
// 直发买手退货地址
this.DirectPddBuyerAfterSaleAddressStr = this.DirectPddBuyerAfterSale?.afterSaleAddress;
}
/// <summary>
/// 仓库拒收按钮文本参数
@@ -479,6 +493,10 @@ namespace AllBase.Model.DBModel
}
public void SetWarehouseWaybillStatusStr()
{
if (order_id == "3737682230178873344")
{
}
WarehouseWaybillStatusStr = "";
if (ItemTransitOrderWithVoid == null)
WarehouseWaybillStatusStr = "";
@@ -491,8 +509,10 @@ namespace AllBase.Model.DBModel
WarehouseWaybillStatusStr = "取号异常-超出派送范围";
else
WarehouseWaybillStatusStr = "取号异常";
}
else if (ItemTransitOrderWithVoid?.warehouse_status == 2)
}
else if (ItemTransitOrderWithVoid?.warehouse_status == 3)
WarehouseWaybillStatusStr = "中转拦截到仓";
else if (ItemTransitOrderWithVoid?.warehouse_status == 2)
WarehouseWaybillStatusStr = "中转已出库";
// 老订单还用之前的逻辑判断
else if (ItemTransitOrderWithVoid?.created_time < new DateTime(2026, 7, 14) && (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
@@ -522,7 +542,7 @@ namespace AllBase.Model.DBModel
var warehouseWaybillStatusStr = WarehouseWaybillStatusStr.ParseToString();
//if (warehouseWaybillStatusStr.StartsWith("中转已作废"))
// return PurpleBrush;
if (warehouseWaybillStatusStr.StartsWith("中转已出库"))
if (warehouseWaybillStatusStr.StartsWith("中转已出库") || warehouseWaybillStatusStr.StartsWith("中转拦截到仓"))
return GlobalConfig.GreenBrush;
if (warehouseWaybillStatusStr.StartsWith("中转已入库") || warehouseWaybillStatusStr.StartsWith("中转已取号") || warehouseWaybillStatusStr.StartsWith("中转提前取号"))
return GlobalConfig.YellowBrush;
@@ -599,7 +619,7 @@ namespace AllBase.Model.DBModel
return ItemTransitOrderWithVoid.refund_status + "(退款金额待获取)";
}
if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后"))
if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && !ItemTransitOrderWithVoid.refund_status.Contains("已超过可申请售后的时间"))
return "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到，", "");
if (order_id == "3737761985909113600")
@@ -622,7 +642,7 @@ namespace AllBase.Model.DBModel
{
if (TransitRefundStatusStr.Contains("退款成功"))
return GlobalConfig.GreenBrush;
if (TransitRefundStatusStr.Contains("需手动申请售后"))
if (TransitRefundStatusStr.Contains("需手动申请售后") || TransitRefundStatusStr.Contains("已超过可申请售后的时间") || TransitRefundStatusStr.Contains("退款失败"))
return GlobalConfig.RedBrush;
return GlobalConfig.LightOrangeBrush;
//return YellowBrush;
@@ -681,7 +701,11 @@ namespace AllBase.Model.DBModel
{
if (ItemOrder?.status == 10)
return "待付款";
if (ItemOrder?.status == 20)
if (ItemOrder?.status == 12)
return "礼物待收下";
if (ItemOrder?.status == 13)
return "一起买待成团";
if (ItemOrder?.status == 20)
return "待店铺发货";
if (ItemOrder?.status == 21)
return "店铺部分发货";
@@ -690,7 +714,7 @@ namespace AllBase.Model.DBModel
if (ItemOrder?.status == 100)
return "订单完成";
if (ItemOrder?.status == 200)
return "售后完成单取消";
return "售后完成订单取消";
if (ItemOrder?.status == 250)
return "未付款已取消";
return "未知状态";
@@ -811,8 +835,8 @@ namespace AllBase.Model.DBModel
DirectRefundStatusBackColor = GlobalConfig.LightOrangeBrush;
if (DirectRefundStatusStr.ParseToString().Contains("退款成功"))
DirectRefundStatusBackColor = GlobalConfig.GreenBrush;
else if (DirectRefundStatusStr.ParseToString().Contains("需手动申请售后"))
DirectRefundStatusBackColor = GlobalConfig.RedBrush;
else if (DirectRefundStatusStr.ParseToString().Contains("需手动申请售后") || DirectRefundStatusStr.ParseToString().Contains("已超过可申请售后的时间"))
DirectRefundStatusBackColor = GlobalConfig.RedBrush;
}
/// <summary>
@@ -1029,7 +1053,8 @@ namespace AllBase.Model.DBModel
BtnAbnormalBtnVisibility = Visibility.Collapsed;
// 买手未退款的，中转正式取号以后的，不可异常重拍
else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" || this.WarehouseWaybillStatusStr == "中转已出库")
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
BtnAbnormalBtnVisibility = Visibility.Collapsed;
// 已正式取号的，不可异常重拍
if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
@@ -1043,7 +1068,7 @@ namespace AllBase.Model.DBModel
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
if (this.ItemOrder?.IsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible;
if (this.ItemOrder?.isAbnormal == true)
if (this.ItemOrder?.isAbnormal == true && this.refund_status <= 1)
{
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")