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

1可设置是否直发拍单 2优化订单取号状态判断逻辑

Browse Source
This commit is contained in:
wule committed 2026-11-06 22:20:18 +08:00
1 parent 9789a4686f
commit 5b9ed01fa1
7 files changed
+125 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_order_item_info.cs
+12 -5
View File
@@ -1557,20 +1557,27 @@ namespace AllBase.Model.DBModel
// 直拍按钮
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
if (GlobalConfig.CurrentBuyPlatform == "pdd")
{
}
else if (GlobalConfig.CurrentBuyPlatform == "tb")
if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30)
{
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
//{
//}
//else if (GlobalConfig.CurrentBuyPlatform == "tb")
//{
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible;
if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
else 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 == "退款成功")
BtnDirectBuyOrderVisibility = Visibility.Visible;
}
else
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
//}
}
else
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
}
public string RefundStatusStr
AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
+7 -1
View File
@@ -121,9 +121,15 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.TransitStatus = "创建失败";
else if (transitOrder.transfer_warehouse_status == 3)
transitDetail.TransitStatus = "创建中";
else if (transitOrder.transfer_warehouse_status == 4)
transitDetail.TransitStatus = "取号失败";
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
if (transitOrder.pickup_time > DateTime.MinValue == false)
if (transitOrder.transfer_warehouse_status == 4)
transitDetail.WarehouseStatus = "取号失败";
else if ((transitOrder.raw_message.ParseToString().Contains("取号异常") || transitOrder.raw_message.ParseToString().Contains("无法调用")) && transitOrder.transfer_warehouse_status != 1)
transitDetail.WarehouseStatus = transitOrder.raw_message.Contains("超出派送范围") ? "取号异常(超区)" : "取号异常";
else if (transitOrder.pickup_time > DateTime.MinValue == false)
transitDetail.WarehouseStatus = "未取号";
else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
transitDetail.WarehouseStatus = "未入库";