diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
index ed7f4d3..3672621 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
@@ -1048,7 +1048,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
bool isUpdate = false;
PddBuyerAfterSaleLiteInfo afterSale = null;
- if (!lstPddBuyerAfterSaleInfoLite.ToList().Any(or => or.afterSalesId == af.afterSalesId))
+ if (!lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId))
{
isUpdate = true;
afterSale = af;
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 5af86d4..ebdec1d 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -1,1364 +1,1381 @@
+ x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListCtrl"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:c="clr-namespace:_29WxOrderWpf.Common"
+ xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
+ xmlns:utils="clr-namespace:_29WxOrderWpf.Utils"
+ xmlns:wpf="WPFCommon"
+ d:DesignHeight="450"
+ d:DesignWidth="1560"
+ Loaded="Window_Loaded"
+ mc:Ignorable="d">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
- 标题包含
-
-
- 标题不含
-
-
-
-
+
+
+
+
+ 标题包含
+
+
+ 标题不含
+
+
+
+
-
-
+
+
-
-
-
-
- 更新时间
-
-
- 成交时间
-
-
+
+
+
+
+ 更新时间
+
+
+ 成交时间
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 店铺备注包含
-
-
- 软件备注包含
-
-
- 店铺备注不含
-
-
- 软件备注不含
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 店铺备注包含
+
+
+ 软件备注包含
+
+
+ 店铺备注不含
+
+
+ 软件备注不含
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index a8adc63..d2986d8 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -1459,6 +1459,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!order.IsWaitReceive)
return true;
+ if (chkNeedCheckExpress.IsChecked == true)
+ {
+ var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功"));
+ var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
+ if (!rst1 && !rst2)
+ return true;
+ }
+
if (chkWaitReceiveBuyerIsNotSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货"))
return true;
if (chkWaitReceiveBuyerIsSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货"))
@@ -2524,6 +2532,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
FilterOrders();
}
+
+ private void chkNeedCheckExpress_Click(object sender, RoutedEventArgs e)
+ {
+ if (sender is CheckBox chk)
+ {
+ var isCheck = !chk.IsChecked.ParseToBool();
+ chkNeedCheckExpress.IsChecked = false;
+ chk.IsChecked = !isCheck;
+ }
+ FilterOrders();
+ }
}
public class OrderFilterConfig : PropertyNotifyObject
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index 536e37a..2684ba4 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -1,39 +1,86 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 4445430..fdfdaa1 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -547,7 +547,8 @@
Style="{StaticResource TextBlockIcon}"
Text="{StaticResource txt-gift}" />
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 973e69d..d0dce54 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -1114,7 +1114,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
- if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.ItemTransitOrder?.warehouse_status != 1 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
+ if (orderItem.ItemTransitOrder?.warehouse_status != 3 && orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.ItemTransitOrder?.warehouse_status != 1 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
{
BaseMsgWindow.ShowError("商品未出库，请选择中转仓拒收！");
return;
diff --git a/29WxOrderWpf/Ctrls/Statistics/Charts/Chart.xaml b/29WxOrderWpf/Ctrls/Statistics/Charts/Chart.xaml
index dd17c18..c6c0131 100644
--- a/29WxOrderWpf/Ctrls/Statistics/Charts/Chart.xaml
+++ b/29WxOrderWpf/Ctrls/Statistics/Charts/Chart.xaml
@@ -1,12 +1,11 @@
-
- -->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/BaseComboBoxStyle.xaml b/29WxOrderWpf/Styles/BaseComboBoxStyle.xaml
index f8f2aed..a77b4d2 100644
--- a/29WxOrderWpf/Styles/BaseComboBoxStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseComboBoxStyle.xaml
@@ -1,179 +1,206 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/BaseDataGridStyle.xaml b/29WxOrderWpf/Styles/BaseDataGridStyle.xaml
index 687c0d0..d2465ab 100644
--- a/29WxOrderWpf/Styles/BaseDataGridStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseDataGridStyle.xaml
@@ -1,23 +1,22 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/BaseTextBoxStyle.xaml b/29WxOrderWpf/Styles/BaseTextBoxStyle.xaml
index 7b70d2b..117a267 100644
--- a/29WxOrderWpf/Styles/BaseTextBoxStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseTextBoxStyle.xaml
@@ -1,50 +1,58 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/BaseWindowStyle.xaml b/29WxOrderWpf/Styles/BaseWindowStyle.xaml
index 8024cbc..80a8123 100644
--- a/29WxOrderWpf/Styles/BaseWindowStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseWindowStyle.xaml
@@ -1,20 +1,19 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml b/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml
index 35b6a06..1b5251c 100644
--- a/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml
+++ b/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml
@@ -1,5 +1,10 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/StaticImageDictionary.xaml b/29WxOrderWpf/Styles/StaticImageDictionary.xaml
index 84c4378..8539d93 100644
--- a/29WxOrderWpf/Styles/StaticImageDictionary.xaml
+++ b/29WxOrderWpf/Styles/StaticImageDictionary.xaml
@@ -1,20 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/UcImageButtonStyle.xaml b/29WxOrderWpf/Styles/UcImageButtonStyle.xaml
index cf8f6c7..a806786 100644
--- a/29WxOrderWpf/Styles/UcImageButtonStyle.xaml
+++ b/29WxOrderWpf/Styles/UcImageButtonStyle.xaml
@@ -1,39 +1,51 @@
-
-
+
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml b/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
index 9e77cda..0e2d93d 100644
--- a/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
+++ b/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
@@ -1,47 +1,64 @@
-
-
-
+
\ No newline at end of file
diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml
index 371523c..480a50e 100644
--- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml
+++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml
@@ -1,321 +1,351 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ x:Class="_29WxOrderWpf.Windows.OrderWindows.TransitAfterSaleWindow"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
+ xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls"
+ Title="TransitAfterSaleWindow"
+ Width="600"
+ Height="650"
+ Loaded="TransitAfterSaleWindow_Loaded"
+ ResizeMode="NoResize"
+ Style="{StaticResource BaseNoneBorderWindowStyle}"
+ mc:Ignorable="d">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
index a9bc490..47928b3 100644
--- a/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
+++ b/29WxOrderWpf/Windows/OrderWindows/TransitAfterSaleWindow.xaml.cs
@@ -45,8 +45,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
- {
- foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
+ {
+ btnAdd.IsEnabled = true;
+ foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{
this.cmbWareHouse.Items.Add(warehouse.TransName);
}
@@ -71,12 +72,29 @@ namespace _29WxOrderWpf.Windows.OrderWindows
}
else
{
+ if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
+ OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
+ {
+ btnAdd.IsEnabled = false;
+ imgLoading.Visibility = Visibility.Visible;
+ await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List() { OrderItem });
+ var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
+ if (order != null)
+ {
+ var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
+ if (orderItemTmp != null)
+ OrderItem = orderItemTmp;
+ }
+ btnAdd.IsEnabled = true;
+ }
+
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
}
}
+ imgLoading.Visibility = Visibility.Collapsed;
var workOrderInfo = await GetWorkOrder();
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
@@ -234,6 +252,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public string AddWorkOrder()
{
+ if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
+ return "\"success\":true,\"message\":\"已到仓，无需拦截工单\"";
+
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
JObject obj = new JObject();
obj["appId"] = this.OrderItem.Shop.ShopId;
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 8a159b7..cf29156 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -36,7 +36,7 @@ namespace AllBase
/// 版本ID
///
- public static int VersionCount = 263;
+ public static int VersionCount = 265;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000";
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index 8313473..0f18fc5 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -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;
diff --git a/WxOrder.Framework/Resources/Fonts/FontGeometry.xaml b/WxOrder.Framework/Resources/Fonts/FontGeometry.xaml
index 6a80a7f..c9b1ddf 100644
--- a/WxOrder.Framework/Resources/Fonts/FontGeometry.xaml
+++ b/WxOrder.Framework/Resources/Fonts/FontGeometry.xaml
@@ -10,10 +10,9 @@
+ xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+ xmlns:sys="clr-namespace:System;assembly=mscorlib">