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

xaml用制表符缩进 优化订单分配逻辑

Browse Source
This commit is contained in:
wule committed 2026-08-28 04:28:48 +08:00
1 parent 237fad81eb
commit aeb30c1171
22 files changed
+2885 -2435
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
+31 -9
View File
@@ -169,6 +169,12 @@ namespace AllBase.Model.DBModel
set { }
}
public string RefundTypeStr
{
get { return this.GetValue(x => x.RefundTypeStr); }
set { this.SetValue(x => x.RefundTypeStr, value); }
}
public DateTime RefundDatetime
{
@@ -313,11 +319,13 @@ namespace AllBase.Model.DBModel
{
get
{
if (order_id == "3738523900304581376")
if (order_id == "3738634560083228416")
{
}
return this.out_express_no + ((this.out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no)) ? "" : " ×");
if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
return this.out_express_no + " ×";
return this.out_express_no;
}
set { }
}
@@ -675,6 +683,13 @@ namespace AllBase.Model.DBModel
else
OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款";
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"))
this.RefundTypeStr = "仅退款/退货退款";
IsWaitBuy = GetIsWaitBuy();
IsWaitSend = GetIsWaitSend();
IsWaitReceive = GetIsWaitReceive();
@@ -712,6 +727,11 @@ namespace AllBase.Model.DBModel
private bool GetIsWaitSend()
{
if (order_id == "3738622310043515392")
{
}
if (status != 20 && status != 21)
return false;
if (refundItems?.Any(r => r.IsRefund) == true)
@@ -723,19 +743,19 @@ namespace AllBase.Model.DBModel
return false;
// 店铺未发货，外采已采购
// out_after_sale_status 新拍订单也不会变，内存里直接根据退款单修改掉
if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 && (string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
(string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
return false;
return true;
}
private bool GetIsWaitReceive()
{
if (order_id == "3738687160199289344")
if (order_id == "3738622310043515392")
{
}
if (refundItems?.Any(r => r.IsRefund) == true)
return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
@@ -747,10 +767,12 @@ namespace AllBase.Model.DBModel
public bool GetIsAbnormal()
{
if (order_id == "3738000949931831296")
{
}
// 如果有售后，直接作为售后单处理
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))*/)
return false;
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
return true;