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

修复部分拍单问题 优化拍单显示

Browse Source
This commit is contained in:
wule_5900x committed 2026-07-13 10:19:19 +08:00
1 parent 87c1b8fc79
commit 5571d227c8
13 files changed
+273 -108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/Local/oms_wei_order_info.cs
+3 -3
View File
@@ -31,7 +31,6 @@ namespace AllBase.Model.Local
public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
private bool isWaitBuy;
/// <summary>
/// 待采购
/// </summary>
@@ -47,6 +46,7 @@ namespace AllBase.Model.Local
if (purchase_status != 0) return false;
if (!out_order_no.IsNullOrEmpty()) return false;
if (status != 20 && status != 21) return false;
if (gift_order_status == 1 || gift_order_status == 2) return false;
return true;
}
set { }
@@ -70,7 +70,7 @@ namespace AllBase.Model.Local
/// </summary>
public bool IsWaitReceive
{
get { return status == 30 || status == 100; }
get { return status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2; }
set { }
}
/// <summary>
@@ -164,7 +164,7 @@ namespace AllBase.Model.Local
{
get
{
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请".Contains(r.statusStr)))
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.statusStr)))
return "退款中";
else if (this.refundItems.Any(r => r.statusStr == "退款完成" || r.statusStr == "退货退款完成"))
return "退款完成";
AllBase/Model/Local/oms_wei_order_item_info.cs
+77 -20
View File
@@ -80,12 +80,18 @@ namespace AllBase.Model.Local
}
public List<oms_wei_external_procurement_log> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log>();
/// <summary>
/// 当前仓库订单（不可以是作废单）
/// </summary>
public oms_wei_external_procurement_log ItemTransitOrder
{
get { return ItemTransitOrders.FirstOrDefault(t => t.order_void_status != 1); }
set { }
}
public oms_wei_external_procurement_log ItemTransitOrderWithFake
/// <summary>
/// 当前仓库订单（可以是作废单）
/// </summary>
public oms_wei_external_procurement_log ItemTransitOrderWithVoid
{
get { return ItemTransitOrders.FirstOrDefault(); }
set { }
@@ -145,11 +151,14 @@ namespace AllBase.Model.Local
{
get
{
if (PddBuyerOrder?.wx_order_id == "3737506236083093504")
if (PddBuyerOrder?.wx_order_id == "3737683253753151488")
{
}
if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("退款成功"))
{
return "买手已退款";
}
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
{
return "已到中转仓";
}
@@ -162,9 +171,18 @@ namespace AllBase.Model.Local
return "买手已发货";
}
if (ItemTransitOrder?.pre_allocated_order_no == 1 || ItemTransitOrder?.pre_allocated_order_no == 3)
var ref_status = (ItemTransitOrderWithVoid?.refund_status).ParseToString();
if (ref_status.Contains("退款成功"))
{
return "买手已退款";
}
if (!ref_status.Contains("退款成功") && ref_status.Length > 0)
{
return "买手已发货";
if (ItemTransitOrder != null)
}
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return "买手已发货";
if (ItemTransitOrderWithVoid != null)
return "买手未发货";
return "";
}
@@ -174,6 +192,8 @@ namespace AllBase.Model.Local
{
get
{
if (BuyerWaybillStatusStr.StartsWith("买手已退款"))
return new SolidColorBrush(Color.FromRgb(152, 96, 143));
if (BuyerWaybillStatusStr.StartsWith("已到中转仓"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102));
if (BuyerWaybillStatusStr.StartsWith("买手已发货"))
@@ -188,6 +208,8 @@ namespace AllBase.Model.Local
{
get
{
if (BuyerWaybillStatusStr.StartsWith("买手已退款"))
return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
if (BuyerWaybillStatusStr.StartsWith("已到中转仓"))
return new SolidColorBrush(Color.FromRgb(208, 245, 224));
if (BuyerWaybillStatusStr.StartsWith("买手已发货"))
@@ -202,6 +224,8 @@ namespace AllBase.Model.Local
{
get
{
if (BuyerWaybillStatusStr.StartsWith("买手已退款"))
return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
if (BuyerWaybillStatusStr.StartsWith("已到中转仓"))
return new SolidColorBrush(Color.FromRgb(231, 250, 240));
if (BuyerWaybillStatusStr.StartsWith("买手已发货"))
@@ -217,13 +241,22 @@ namespace AllBase.Model.Local
{
get
{
if ((ItemTransitOrder?.pre_allocated_order_no == 1 || ItemTransitOrder?.pre_allocated_order_no == 3) && !ItemTransitOrder.express_2_company.IsNullOrEmpty() && !ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
if(order_id == "3737596572558051840")
{
}
if (ItemTransitOrderWithVoid?.order_void_status == 2)
return "中转作废失败";
if (ItemTransitOrderWithVoid?.order_void_status == 1)
return "中转已作废";
if ((ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
return "中转已发货";
if (ItemTransitOrder?.pre_allocated_order_no == 1 || ItemTransitOrder?.pre_allocated_order_no == 3)
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return "待中转发货";
if (ItemTransitOrder?.pre_allocated_order_no == 2)
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 2)
return "中转提前取号";
if (ItemTransitOrder?.pre_allocated_order_no == 0)
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 0)
return "待中转取号";
return "";
}
@@ -233,6 +266,8 @@ namespace AllBase.Model.Local
{
get
{
if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
return new SolidColorBrush(Color.FromRgb(152, 96, 143));
if (WarehouseWaybillStatusStr.StartsWith("中转已发货"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102));
if (WarehouseWaybillStatusStr.StartsWith("待中转发货") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
@@ -247,13 +282,15 @@ namespace AllBase.Model.Local
{
get
{
if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
if (WarehouseWaybillStatusStr.StartsWith("中转已发货"))
return new SolidColorBrush(Color.FromRgb(208, 245, 224));
if (WarehouseWaybillStatusStr.StartsWith("待中转发货") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 241, 204));
if (WarehouseWaybillStatusStr.StartsWith("待中转取号"))
return new SolidColorBrush(Color.FromRgb(255, 219, 219));
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return new SolidColorBrush(Color.FromRgb(255, 219, 219));
}
set { }
}
@@ -261,31 +298,51 @@ namespace AllBase.Model.Local
{
get
{
if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
if (WarehouseWaybillStatusStr.StartsWith("中转已发货"))
return new SolidColorBrush(Color.FromRgb(231, 250, 240));
if (WarehouseWaybillStatusStr.StartsWith("待中转发货") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 248, 230));
if (WarehouseWaybillStatusStr.StartsWith("待中转取号"))
return new SolidColorBrush(Color.FromRgb(255, 237, 237));
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return new SolidColorBrush(Color.FromRgb(255, 237, 237));
}
set { }
}
/// <summary>
/// 中转仓表买手售后字段文字显示
/// </summary>
public string TransitRefundStatusStr
{
get
{
if (!string.IsNullOrEmpty(ItemTransitOrder?.refund_status))
if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status))
{
if (!ItemTransitOrder.refund_status.Contains("需手动申请售后"))
return "已申请售后 " + ItemTransitOrder.refund_status.Replace("申请收到，", "");
return ItemTransitOrder.refund_status;
if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后"))
return "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到，", "");
return ItemTransitOrderWithVoid.refund_status;
}
return "";
}
set { }
}
/// <summary>
/// 中转仓表买手售后字段文字显示背景颜色
/// </summary>
public SolidColorBrush TransitRefundStatusBackColor
{
get
{
if (TransitRefundStatusStr.Contains("退款成功"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102));
if (TransitRefundStatusStr.Contains("需手动申请售后"))
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
//return new SolidColorBrush(Color.FromRgb(255, 186, 0));
return new SolidColorBrush(Color.FromRgb(255, 155, 0));
}
set { }
}
// 仓库采购时间是否达标字段
@@ -293,14 +350,14 @@ namespace AllBase.Model.Local
{
get
{
if (ItemTransitOrderWithFake == null)
if (ItemTransitOrderWithVoid == null)
return "";
if (ItemOrder.createDateTime == null)
ItemOrder.createDateTime = BaseClass.StampToDateTime(ItemOrder.create_time);
string timeStr = "采购时间：" + ItemTransitOrderWithFake.created_time.ToString("yyyy-MM-dd HH:mm:ss");
if (ItemOrder.createDateTime.Value.Date != ItemTransitOrderWithFake.created_time.Date && ItemTransitOrderWithFake.created_time > ItemTransitOrderWithFake.created_time.Date.AddHours(1.5))
string timeStr = "采购时间：" + ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
if (ItemOrder.createDateTime.Value.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
return timeStr + " ×";
return timeStr + " √";
}
AllBase/Model/Local/oms_wei_refund_info.cs
+4 -1
View File
@@ -30,6 +30,7 @@ namespace AllBase.Model.Local
if (status == "MERCHANT_FAIL") return "售后关闭";
if (status == "USER_WAIT_CONFIRM_UPDATE") return "待用户处理商家协商";
if (status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE") return "待用户处理商家代发起的售后申请";
if (status == "WAIT_PACKAGE_INTERCEPT") return "物流拦截中";
return "售后状态读取失败";
}
set { }
@@ -42,7 +43,8 @@ namespace AllBase.Model.Local
get
{
if (status == "MERCHANT_PROCESSING" || status == "PLATFORM_REFUNDING" || status == "USER_WAIT_RETURN" || status == "MERCHANT_WAIT_RECEIPT" ||
status == "USER_WAIT_CONFIRM" || status == "USER_WAIT_CONFIRM_UPDATE" || status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE")
status == "USER_WAIT_CONFIRM" || status == "USER_WAIT_CONFIRM_UPDATE" || status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE" ||
status == "WAIT_PACKAGE_INTERCEPT")
return new SolidColorBrush(Color.FromRgb(230, 162, 60));
if (status == "MERCHANT_REFUND_SUCCESS" || status == "MERCHANT_RETURN_SUCCESS")
return new SolidColorBrush(Color.FromRgb(103, 194, 58));
@@ -85,6 +87,7 @@ namespace AllBase.Model.Local
/// MERCHANT_FAIL 售后关闭
/// USER_WAIT_CONFIRM_UPDATE 待用户处理商家协商
/// USER_WAIT_HANDLE_MERCHANT_AFTER_SALE 待用户处理商家代发起的售后申请
/// WAIT_PACKAGE_INTERCEPT 物流拦截中;
/// </summary>
public string status { get; set; }
/// <summary>
AllBase/Model/MvvmBaseClasses/PropertyNotifyObject.cs
+2 -1
View File
@@ -27,7 +27,8 @@ namespace AllBase.Model.MvvmBaseClasses
if (!_ValueDictionary.TryGetValue(propertyName, out _propertyValue))
{
_propertyValue = default(T);
_ValueDictionary.Add(propertyName, _propertyValue);
//_ValueDictionary.Add(propertyName, _propertyValue);
_ValueDictionary[propertyName] = _propertyValue;
}
return (T)_propertyValue;
}