修复买手退款异常单异常重拍按钮不显示的bug

This commit is contained in:
wule committed 2026-11-05 19:56:42 +08:00
1 parent a4bc9a788e
commit 3483c99d37
2 files changed
+39 -39

No files matched your search

@@ -113,7 +113,7 @@
d:Background="{StaticResource PageOkBrush}"
d:BorderBrush="{StaticResource PageOkBrush}"
Background="{Binding TransitDetailRefundStatusBackColor}"
BorderBrush="{Binding TransitDeatilRefundStatusBackColor}"
BorderBrush="{Binding TransitDetailRefundStatusBackColor}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding TransitDetailRefundStatusStrVisibility}">
@@ -1416,12 +1416,20 @@ namespace AllBase.Model.DBModel
}
/// <summary>
/// 拼多多秒退异常重拍按钮可见条件
/// 作废按钮可见性
/// </summary>
public Visibility BtnAbnormalBtnVisibility
public Visibility BtnVoidTransitOrderVisibility
{
get { return this.GetValue(x => x.BtnAbnormalBtnVisibility); }
set { this.SetValue(x => x.BtnAbnormalBtnVisibility, value); }
get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
}
/// <summary>
/// 异常重拍按钮可见性
/// </summary>
public Visibility BtnAbnormalOrderRebuyVisibility
{
get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
}
/// <summary>
/// 直发按钮可见条件
@@ -1433,36 +1441,35 @@ namespace AllBase.Model.DBModel
}
public void SetAbnormalAndDirectBtnVisibility()
{
bool? _itemOrderIsAbnormal = ItemOrder?.GetIsAbnormal();
bool? _itemOrderIsWaitBuy = ItemOrder?.GetIsWaitBuy();
// 买手秒退异常重拍
BtnAbnormalBtnVisibility = Visibility.Visible;
var _btnAbnormalOrderRebuyVisibility = Visibility.Visible;
// 不是异常单的不可异常重拍
if (this.ItemOrder?.IsAbnormal != true)
BtnAbnormalBtnVisibility = Visibility.Collapsed;
if (_itemOrderIsAbnormal != true)
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 买手未退款的,中转正式取号以后的,不可异常重拍
else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
BtnAbnormalBtnVisibility = Visibility.Collapsed;
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 已正式取号的,不可异常重拍
if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
BtnAbnormalBtnVisibility = Visibility.Collapsed;
else if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
BtnAbnormalBtnVisibility = Visibility.Collapsed;
if (order_id == "3738706885587395328")
{
}
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility;
// 直拍按钮
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
{
if (this.ItemOrder?.GetIsWaitBuy() == true && this.BuyGoodsBtnTxt != "关联拍单")
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible;
if (this.ItemOrder?.GetIsAbnormal() == true && this.refund_status <= 1)
if (_itemOrderIsAbnormal == 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 == "退款成功")
@@ -1485,17 +1492,6 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
}
public Visibility BtnVoidTransitOrderVisibility
{
get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
}
public Visibility BtnAbnormalOrderRebuyVisibility
{
get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
}
public Visibility OutOrderNoVisibility
{
get { return this.GetValue(x => x.OutOrderNoVisibility); }
@@ -1693,7 +1689,6 @@ namespace AllBase.Model.DBModel
// 拍单、代发等信息判断并控制拍单按钮
this.UpdateOrderItemBuyButton();
this.SetAbnormalAndDirectBtnVisibility();
SetEWaybillInfo();
SetOutOrderTimeQualifiedStr();
@@ -1711,6 +1706,13 @@ namespace AllBase.Model.DBModel
ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
}
//oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
//{
// OrderItem = this,
//};
//TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
}
/// <summary> 初始化物流明细信息 </summary>
@@ -1812,11 +1814,8 @@ namespace AllBase.Model.DBModel
BtnVoidTransitOrderVisibility = Visibility.Visible;
else
BtnVoidTransitOrderVisibility = Visibility.Collapsed;
// 异常重拍
if (order_item.GetIsAbnormalOrderRebuy())
BtnAbnormalOrderRebuyVisibility = Visibility.Visible;
else
BtnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 异常重拍和直拍按钮
SetAbnormalAndDirectBtnVisibility();
}
/// <summary>
@@ -1826,7 +1825,7 @@ namespace AllBase.Model.DBModel
/// <returns></returns>
public bool GetIsAbnormalOrderRebuy()
{
if (order_id == "3740040052771291904")
if (order_id == "3740287208579314176")
{
}
@@ -1834,11 +1833,12 @@ namespace AllBase.Model.DBModel
var order_item = this;
// 不是异常单的不可异常重拍
if (order_item?.ItemOrder?.IsAbnormal != true)
if (order_item?.ItemOrder?.GetIsAbnormal() != true)
return false;
// 买手未退款的,中转正式取号以后的,不可异常重拍
if (order_item.ItemTransitOrderWithVoid?.refund_status != "买手退款成功" ||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
return false;
// 已正式取号的,不可异常重拍
if (order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)