增量读取订单功能 90% 新的二级oem 50%

This commit is contained in:
wule committed 2026-11-17 16:43:47 +08:00
1 parent e3f4e34def
commit 171064f03f
31 files changed
+1169 -624

No files matched your search

@@ -72,7 +72,7 @@ XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司(仓库二楼)
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐汇区徐家汇街道虹桥路616号A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐汇区徐家汇街道虹桥路616号A座T区 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼
XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋";
+53 -53
View File
@@ -57,36 +57,36 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.OrderBuyTypeColor, value); }
}
public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
public oms_wei_order_item_info orderItem
public ObservableCollection<oms_wei_order_item_info> OrderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
public oms_wei_order_item_info OrderItem
{
get { return this.GetValue(x => x.orderItem); }
set { this.SetValue(x => x.orderItem, value); }
get { return this.GetValue(x => x.OrderItem); }
set { this.SetValue(x => x.OrderItem, value); }
}
public oms_wei_order_item_info orderItem2
public oms_wei_order_item_info OrderItem2
{
get { return this.GetValue(x => x.orderItem2); }
set { this.SetValue(x => x.orderItem2, value); }
get { return this.GetValue(x => x.OrderItem2); }
set { this.SetValue(x => x.OrderItem2, value); }
}
public oms_wei_order_item_info orderItem3
public oms_wei_order_item_info OrderItem3
{
get { return this.GetValue(x => x.orderItem3); }
set { this.SetValue(x => x.orderItem3, value); }
get { return this.GetValue(x => x.OrderItem3); }
set { this.SetValue(x => x.OrderItem3, value); }
}
public oms_wei_order_item_info orderItem4
public oms_wei_order_item_info OrderItem4
{
get { return this.GetValue(x => x.orderItem4); }
set { this.SetValue(x => x.orderItem4, value); }
get { return this.GetValue(x => x.OrderItem4); }
set { this.SetValue(x => x.OrderItem4, value); }
}
public oms_wei_order_item_info orderItem5
public oms_wei_order_item_info OrderItem5
{
get { return this.GetValue(x => x.orderItem5); }
set { this.SetValue(x => x.orderItem5, value); }
get { return this.GetValue(x => x.OrderItem5); }
set { this.SetValue(x => x.OrderItem5, value); }
}
public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
public ObservableCollection<oms_wei_refund_info> RefundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
public ConcurrentList<oms_wei_ewaybill_path> latestEWaybills { get; set; } = new ConcurrentList<oms_wei_ewaybill_path>();
public ConcurrentList<oms_wei_ewaybill_path> LatestEWaybills { get; set; } = new ConcurrentList<oms_wei_ewaybill_path>();
/// <summary>
/// 待采购
@@ -255,14 +255,14 @@ namespace AllBase.Model.DBModel
}
void SetDeliveryDeadlineStatusStr()
{
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
if (this.RefundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
DeliveryDeadlineStatusStr = "退款中";
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
else if (this.RefundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
DeliveryDeadlineStatusStr = "退款完成";
// 用户取消申请
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
this.RefundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
DeliveryDeadlineStatusStr = this.RefundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
else if (this.status == 20 || this.status == 21)
{
DeliveryDeadlineStatusStr = "剩余";
@@ -755,17 +755,17 @@ namespace AllBase.Model.DBModel
{
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{
OrderBuyType = "云改直";
OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
}
else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
else if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
{
OrderBuyType = "直发";
OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
}
else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
else if (this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{
OrderBuyType = "云仓";
OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
@@ -773,11 +773,11 @@ namespace AllBase.Model.DBModel
else
OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "退货退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "仅退款/退货退款";
IsWaitBuy = GetIsWaitBuy();
@@ -795,7 +795,7 @@ namespace AllBase.Model.DBModel
else
IsShowChangeWaybillBtn = true;
if (IsWaitBuy || this.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
if (IsWaitBuy || this.OrderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
IsShowTransitExtraPackagesBtn = false;
else
IsShowTransitExtraPackagesBtn = true;
@@ -807,12 +807,12 @@ namespace AllBase.Model.DBModel
SetShipDoneTimeStr();
SetColorBrush();
orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : "";
OrderItem = OrderItems.FirstOrDefault() != null ? OrderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderItem2 = OrderItems.Count > 1 ? OrderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderItem3 = OrderItems.Count > 2 ? OrderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderItem4 = OrderItems.Count > 3 ? OrderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderItem5 = OrderItems.Count > 4 ? OrderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderDiffItemCountStr = OrderItems.Count > 1 ? "该订单共有 " + OrderItems.Count + " 个不同的商品规格" : "";
}
public void SetColorBrush()
@@ -835,13 +835,13 @@ namespace AllBase.Model.DBModel
{
if (status != 20 && status != 21)
return false;
if (refundItems?.Any(r => r.IsRefund) == true)
if (RefundItems?.Any(r => r.IsRefund) == true)
return false;
// 子表有售后信息(可能更新不及时)
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false;
// 中转仓有拍单信息
if (orderItems.All(oi => oi.ItemTransitOrder != null))
if (OrderItems.All(oi => oi.ItemTransitOrder != null))
return false;
// 采购状态为已采购
if (purchase_status != 0)
@@ -865,16 +865,16 @@ namespace AllBase.Model.DBModel
if (status != 20 && status != 21)
return false;
if (refundItems?.Any(r => r.IsRefund) == true)
if (RefundItems?.Any(r => r.IsRefund) == true)
return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false;
// 礼物单已发货
if (gift_order_status == 1 || gift_order_status == 2)
return false;
// 店铺未发货,外采已采购
// out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉
if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
if (!OrderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
(string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
return false;
return true;
@@ -882,9 +882,9 @@ namespace AllBase.Model.DBModel
private bool GetIsWaitReceive()
{
if (refundItems?.Any(r => r.IsRefund) == true)
if (RefundItems?.Any(r => r.IsRefund) == true)
return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false;
if (!(status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2))
return false;
@@ -903,23 +903,23 @@ namespace AllBase.Model.DBModel
return false;
// 如果有售后,直接作为售后单处理
if (orderItems.All(oi => oi.refund_status > 1))
if (OrderItems.All(oi => oi.refund_status > 1))
return false;
// 直发或者云改直已购买且未退货,从异常单移除
if (orderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
if (OrderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
return false;
if (gift_order_status == 1 || gift_order_status == 2)
return false;
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
if (OrderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
return true;
// 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
if (OrderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
return true;
// 取号异常或无法调用发货也放在异常单(异常需重拍)
// 订单不满足鸿浩仓库发货条件,无法调用鸿浩仓库接口发货
else if (orderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
else if (OrderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
(oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
return true;
@@ -929,7 +929,7 @@ namespace AllBase.Model.DBModel
public bool GetIsRefund()
{
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
if (!orderItems.Any(oi => oi.refund_status > 1))
if (!OrderItems.Any(oi => oi.refund_status > 1))
return false;
if (GetIsEmergency())
return false;
@@ -939,16 +939,16 @@ namespace AllBase.Model.DBModel
public bool GetIsEmergency()
{
// 微信订单退货中
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
if (OrderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
{
return true;
}
// 微信订单退款中或退款成功,但是买手订单未完成退款
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
if (OrderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
{
return true;
}
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
if (OrderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
{
return true;
}
@@ -959,7 +959,7 @@ namespace AllBase.Model.DBModel
{
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
return this.OrderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
}
}
}
@@ -306,10 +306,10 @@ namespace AllBase.Model.DBModel
{
}
if (ItemOrder?.refundItems?.Count == 1)
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
if (ItemOrder?.RefundItems?.Count == 1)
ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault();
else
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
this.RefundResultStr = "";
@@ -1328,7 +1328,7 @@ namespace AllBase.Model.DBModel
//get { return "¥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
CashCouponDiscountedPriceStr = "¥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.orderItems.Count).ParseToDecimal().ToString("0.00");
PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.OrderItems.Count).ParseToDecimal().ToString("0.00");
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
PurchasePriceStr = "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00");
@@ -1361,8 +1361,8 @@ namespace AllBase.Model.DBModel
OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count;
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.orderItems.Count;
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.OrderItems.Count;
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.OrderItems.Count;
ProfitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price - purchase_price.ParseToInt() - freight.ParseToInt() -
predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
@@ -1845,13 +1845,13 @@ namespace AllBase.Model.DBModel
/// <summary> 初始化物流明细信息 </summary>
public void SetEWaybillInfo()
{
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
if (this.ItemOrder?.LatestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
LatestTransitEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
else
LatestTransitEWaybill = null;
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no))
LatestDirectEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
if (this.ItemOrder?.LatestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no))
LatestDirectEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
else
LatestDirectEWaybill = null;
}