订单筛选功能优化
This commit is contained in:
1 parent
9ce8c6e6bc
commit
f3ec329e77
7 files changed
+347
-62
No files matched your search
@@ -666,15 +666,35 @@
|
|||||||
Margin="4,0,4,4"
|
Margin="4,0,4,4"
|
||||||
BorderBrush="#e0e0e0"
|
BorderBrush="#e0e0e0"
|
||||||
BorderThickness="0,0,0,1">
|
BorderThickness="0,0,0,1">
|
||||||
<CheckBox
|
<WrapPanel>
|
||||||
x:Name="chkDirectSendFailed"
|
<CheckBox
|
||||||
Margin="6,8"
|
x:Name="chkDirectSendFailed"
|
||||||
HorizontalAlignment="Left"
|
Margin="6,8"
|
||||||
VerticalAlignment="Center"
|
HorizontalAlignment="Left"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
VerticalAlignment="Center"
|
||||||
Click="chkDirectSendFailed_Click"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Content="直拍发货失败"
|
Click="chkDirectSendFailed_Click"
|
||||||
FontSize="12" />
|
Content="直拍发货失败"
|
||||||
|
FontSize="12" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkWaitSend48HourNoWaybill"
|
||||||
|
Margin="6,8"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkWaitSendNoWaybill_Click"
|
||||||
|
Content="48小时未发货"
|
||||||
|
FontSize="12" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkWaitSend72HourNoWaybill"
|
||||||
|
Margin="6,8"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkWaitSendNoWaybill_Click"
|
||||||
|
Content="72小时未发货"
|
||||||
|
FontSize="12" />
|
||||||
|
</WrapPanel>
|
||||||
</Border>
|
</Border>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem
|
<TabItem
|
||||||
@@ -700,15 +720,43 @@
|
|||||||
<ColumnDefinition Width="auto" />
|
<ColumnDefinition Width="auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<CheckBox
|
<WrapPanel>
|
||||||
x:Name="chkNeedCheckExpress"
|
<CheckBox
|
||||||
Margin="6,8"
|
x:Name="chkNeedCheckExpress"
|
||||||
HorizontalAlignment="Left"
|
Margin="6,8"
|
||||||
VerticalAlignment="Center"
|
HorizontalAlignment="Left"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
VerticalAlignment="Center"
|
||||||
Click="chkNeedCheckExpress_Click"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Content="需核对物流"
|
Click="chkNeedCheckExpress_Click"
|
||||||
FontSize="12" />
|
Content="需核对物流"
|
||||||
|
FontSize="12" />
|
||||||
|
<Polyline
|
||||||
|
Grid.Column="3"
|
||||||
|
Width="10"
|
||||||
|
Margin="5,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Points="5,0 5,8 5,0"
|
||||||
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
|
StrokeThickness="2" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chk48HourNoWaybill"
|
||||||
|
Margin="6,8"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkNoWaybill_Click"
|
||||||
|
Content="48小时未发货"
|
||||||
|
FontSize="12" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chk72HourNoWaybill"
|
||||||
|
Margin="6,8"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkNoWaybill_Click"
|
||||||
|
Content="72小时未发货"
|
||||||
|
FontSize="12" />
|
||||||
|
</WrapPanel>
|
||||||
<WrapPanel
|
<WrapPanel
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
d:Opacity="0.2"
|
d:Opacity="0.2"
|
||||||
@@ -1017,7 +1065,7 @@
|
|||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent
|
<wpf:TitleContent
|
||||||
Title="拦截退回总店状态"
|
Title="拦截退回总店状态"
|
||||||
Margin="4,0,4,0"
|
Margin="8,0,4,0"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
Foreground="Black"
|
Foreground="Black"
|
||||||
@@ -1090,17 +1138,7 @@
|
|||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<WrapPanel>
|
<WrapPanel>
|
||||||
<Button
|
|
||||||
x:Name="btnBatchRefund2"
|
|
||||||
Grid.Column="1"
|
|
||||||
Height="20"
|
|
||||||
MinWidth="48"
|
|
||||||
Margin="6,6"
|
|
||||||
Padding="4,0"
|
|
||||||
Click="btnBatchRefund_Click"
|
|
||||||
Content="批量申请买手售后"
|
|
||||||
FontSize="12"
|
|
||||||
Style="{StaticResource BasePageButtonStyle}" />
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkShopIsRefund"
|
x:Name="chkShopIsRefund"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
@@ -1139,6 +1177,72 @@
|
|||||||
Click="chkUpShopAddressAnalyseFailed_Click"
|
Click="chkUpShopAddressAnalyseFailed_Click"
|
||||||
Content="总店地址解析失败"
|
Content="总店地址解析失败"
|
||||||
FontSize="12" />
|
FontSize="12" />
|
||||||
|
<Polyline
|
||||||
|
Grid.Column="14"
|
||||||
|
Width="10"
|
||||||
|
Margin="5,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Points="5,0 5,8 5,0"
|
||||||
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
|
StrokeThickness="2"
|
||||||
|
Visibility="Visible" />
|
||||||
|
|
||||||
|
<wpf:TitleContent
|
||||||
|
Title="买手退货状态"
|
||||||
|
Margin="4,0,4,0"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
FontSize="12"
|
||||||
|
Foreground="Black"
|
||||||
|
Placement="Left"
|
||||||
|
TitleVerticalAlignment="Center">
|
||||||
|
<ComboBox
|
||||||
|
x:Name="cmbReturnOrderBuyerStatus"
|
||||||
|
Width="130"
|
||||||
|
Height="23"
|
||||||
|
SelectedIndex="0"
|
||||||
|
SelectionChanged="cmbReturnOrderBuyerStatus_SelectionChanged"
|
||||||
|
Style="{StaticResource RoundedComboBox}">
|
||||||
|
<ComboBoxItem Content="请选择" />
|
||||||
|
<ComboBoxItem Content="买手待申请售后" />
|
||||||
|
<ComboBoxItem Content="买手待退货" />
|
||||||
|
<ComboBoxItem Content="买手已寄出待商家退款" />
|
||||||
|
<ComboBoxItem Content="买手退货失败" />
|
||||||
|
</ComboBox>
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<Button
|
||||||
|
x:Name="btnBatchRefund2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Height="20"
|
||||||
|
MinWidth="48"
|
||||||
|
Margin="6,6"
|
||||||
|
Padding="4,0"
|
||||||
|
Click="btnBatchRefund_Click"
|
||||||
|
Content="批量申请买手售后"
|
||||||
|
FontSize="12"
|
||||||
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
|
<wpf:TitleContent
|
||||||
|
Title="退货仓状态"
|
||||||
|
Margin="8,0,4,0"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
FontSize="12"
|
||||||
|
Foreground="Black"
|
||||||
|
Placement="Left"
|
||||||
|
TitleVerticalAlignment="Center">
|
||||||
|
<ComboBox
|
||||||
|
x:Name="cmbReturnOrderStatus"
|
||||||
|
Width="100"
|
||||||
|
Height="23"
|
||||||
|
SelectedIndex="0"
|
||||||
|
SelectionChanged="cmbReturnOrderStatus_SelectionChanged"
|
||||||
|
Style="{StaticResource RoundedComboBox}">
|
||||||
|
<ComboBoxItem Content="请选择" />
|
||||||
|
<ComboBoxItem Content="未创建" />
|
||||||
|
<ComboBoxItem Content="创建失败" />
|
||||||
|
<ComboBoxItem Content="已创建未到仓" />
|
||||||
|
<ComboBoxItem Content="已到仓" />
|
||||||
|
<ComboBoxItem Content="已发回" />
|
||||||
|
</ComboBox>
|
||||||
|
</wpf:TitleContent>
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -1557,6 +1557,31 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (!rst2)
|
if (!rst2)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (chkWaitSend72HourNoWaybill.IsChecked == true)
|
||||||
|
{
|
||||||
|
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
||||||
|
{ }
|
||||||
|
else if (order.orderItems.Any(oi => oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
||||||
|
{ }
|
||||||
|
else
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (chkWaitSend48HourNoWaybill.IsChecked == true)
|
||||||
|
{
|
||||||
|
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
||||||
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
||||||
|
{ }
|
||||||
|
else if (order.orderItems.Any(oi => oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
||||||
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
||||||
|
{ }
|
||||||
|
else
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (filterHeadStr.StartsWith("待收货"))
|
if (filterHeadStr.StartsWith("待收货"))
|
||||||
{
|
{
|
||||||
@@ -1585,6 +1610,31 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
return true;
|
return true;
|
||||||
if (chkWaitReceiveWarehouseIsSendOut.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库"))
|
if (chkWaitReceiveWarehouseIsSendOut.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库"))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
if (chk72HourNoWaybill.IsChecked == true)
|
||||||
|
{
|
||||||
|
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
||||||
|
{ }
|
||||||
|
else if (order.orderItems.Any(oi => oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
||||||
|
{ }
|
||||||
|
else
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (chk48HourNoWaybill.IsChecked == true)
|
||||||
|
{
|
||||||
|
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
||||||
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
||||||
|
{ }
|
||||||
|
else if (order.orderItems.Any(oi => oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||||
|
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
||||||
|
bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))))
|
||||||
|
{ }
|
||||||
|
else
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (filterHeadStr.StartsWith("异常需重拍") && !order.isAbnormal)
|
if (filterHeadStr.StartsWith("异常需重拍") && !order.isAbnormal)
|
||||||
{
|
{
|
||||||
@@ -1683,12 +1733,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
foreach (var orderItem in order.orderItems)
|
foreach (var orderItem in order.orderItems)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 1000; i++)
|
var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.PddBuyerAfterSale?.afterSaleAddress);
|
||||||
{
|
if (!receiver.receiver_address.IsNullOrEmpty() && receiver.receiver_name.Length <= 15)
|
||||||
var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.PddBuyerAfterSale?.afterSaleAddress);
|
return true;
|
||||||
if (!receiver.receiver_address.IsNullOrEmpty())
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1699,11 +1746,34 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
foreach (var orderItem in order.orderItems)
|
foreach (var orderItem in order.orderItems)
|
||||||
{
|
{
|
||||||
var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.DirectPddBuyerAfterSale?.afterSaleAddress);
|
var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.DirectPddBuyerAfterSale?.afterSaleAddress);
|
||||||
if (!receiver.receiver_address.IsNullOrEmpty())
|
if (!receiver.receiver_address.IsNullOrEmpty() && receiver.receiver_name.Length <= 15)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var cmbReturnOrderStatusText = cmbReturnOrderStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||||
|
if (cmbReturnOrderStatusText == "未创建" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "未创建"))
|
||||||
|
return true;
|
||||||
|
if (cmbReturnOrderStatusText == "创建失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "创建失败"))
|
||||||
|
return true;
|
||||||
|
if (cmbReturnOrderStatusText == "已创建未到仓" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已创建未到仓")))
|
||||||
|
return true;
|
||||||
|
if (cmbReturnOrderStatusText == "已到仓" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已到仓")))
|
||||||
|
return true;
|
||||||
|
if (cmbReturnOrderStatusText == "已发回" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已发回")))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var cmbReturnOrderBuyerStatusText = cmbReturnOrderBuyerStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||||
|
|
||||||
|
if (cmbReturnOrderBuyerStatusText == "买手待申请售后" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||||
|
return true;
|
||||||
|
else if (cmbReturnOrderBuyerStatusText == "买手待退货" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
|
||||||
|
return true;
|
||||||
|
else if (cmbReturnOrderBuyerStatusText == "买手已寄出待商家退款" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中")))
|
||||||
|
return true;
|
||||||
|
else if (cmbReturnOrderBuyerStatusText == "买手退货失败" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败")))
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
if (filterHeadStr.StartsWith("售后完成单"))
|
if (filterHeadStr.StartsWith("售后完成单"))
|
||||||
{
|
{
|
||||||
@@ -2762,6 +2832,38 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
Content = autoBuyIntroForm,
|
Content = autoBuyIntroForm,
|
||||||
}.ShowDialog();
|
}.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void chkNoWaybill_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is CheckBox chk)
|
||||||
|
{
|
||||||
|
var isCheck = !chk.IsChecked.ParseToBool();
|
||||||
|
chk48HourNoWaybill.IsChecked = chk72HourNoWaybill.IsChecked = false;
|
||||||
|
chk.IsChecked = !isCheck;
|
||||||
|
}
|
||||||
|
FilterOrders();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void chkWaitSendNoWaybill_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is CheckBox chk)
|
||||||
|
{
|
||||||
|
var isCheck = !chk.IsChecked.ParseToBool();
|
||||||
|
chkWaitSend48HourNoWaybill.IsChecked = chkWaitSend72HourNoWaybill.IsChecked = false;
|
||||||
|
chk.IsChecked = !isCheck;
|
||||||
|
}
|
||||||
|
FilterOrders();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cmbReturnOrderStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
FilterOrders();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cmbReturnOrderBuyerStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
FilterOrders();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class OrderFilterConfig : PropertyNotifyObject
|
public class OrderFilterConfig : PropertyNotifyObject
|
||||||
|
|||||||
@@ -430,15 +430,33 @@
|
|||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
|
|
||||||
<!-- 售后状态 -->
|
<!-- 售后状态 -->
|
||||||
<TextBlock
|
<WrapPanel>
|
||||||
x:Name="txtStatusStr"
|
<TextBlock
|
||||||
HorizontalAlignment="Center"
|
x:Name="txtOrderItemStatusStr"
|
||||||
VerticalAlignment="Top"
|
HorizontalAlignment="Center"
|
||||||
d:Text="售后状态"
|
VerticalAlignment="Top"
|
||||||
Background="Transparent"
|
d:Text="物品售后状态"
|
||||||
Foreground="{Binding ItemRefund.RefundStatusColor}"
|
Background="Transparent"
|
||||||
Text="{Binding ItemRefund.RefundStatusStr}"
|
Foreground="{Binding ItemRefund.RefundStatusColor}"
|
||||||
Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
|
Text="{Binding RefundStatusStr}"
|
||||||
|
Visibility="{Binding ElementName=txtOrderItemStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
|
||||||
|
<TextBlock
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Background="Transparent"
|
||||||
|
Foreground="{Binding ItemRefund.RefundStatusColor}"
|
||||||
|
Text=":"
|
||||||
|
Visibility="{Binding ElementName=txtOrderItemStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
|
||||||
|
<TextBlock
|
||||||
|
x:Name="txtStatusStr"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Text="售后状态"
|
||||||
|
Background="Transparent"
|
||||||
|
Foreground="{Binding ItemRefund.RefundStatusColor}"
|
||||||
|
Text="{Binding ItemRefund.RefundStatusStr}"
|
||||||
|
Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
|
||||||
|
</WrapPanel>
|
||||||
<!-- 售后原因 -->
|
<!-- 售后原因 -->
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="txtRefundReasonTextStr"
|
x:Name="txtRefundReasonTextStr"
|
||||||
@@ -1115,7 +1133,7 @@
|
|||||||
WaterMark="云仓退货" />
|
WaterMark="云仓退货" />
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnRetrunOrder"
|
x:Name="btnRetrunOrder"
|
||||||
d:Content="添加"
|
d:Content="未创建"
|
||||||
Click="btnReturnOrder_Click"
|
Click="btnReturnOrder_Click"
|
||||||
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
||||||
Style="{StaticResource LinkButton}" />
|
Style="{StaticResource LinkButton}" />
|
||||||
|
|||||||
@@ -110,7 +110,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
txtMobile.Text = OrderItem.DistribReturnOrderInfo.receiver_phone;
|
txtMobile.Text = OrderItem.DistribReturnOrderInfo.receiver_phone;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (OrderItem.AddEditTransitWarehouseReturnOrderStr == "已创建" || OrderItem.AddEditTransitWarehouseReturnOrderStr == "处理中")
|
if (OrderItem.AddEditTransitWarehouseReturnOrderStr == "已创建未到仓" || OrderItem.AddEditTransitWarehouseReturnOrderStr == "已到仓" ||
|
||||||
|
OrderItem.AddEditTransitWarehouseReturnOrderStr == "已发回")
|
||||||
btnAdd.IsEnabled = false;
|
btnAdd.IsEnabled = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -254,7 +255,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
if (wxExpressName.IsNullOrEmpty() || OrderItem.ItemRefund.return_waybill_id.IsNullOrEmpty() || receiver.receiver_name.IsNullOrEmpty() || receiver.receiver_phone.IsNullOrEmpty() ||
|
if (wxExpressName.IsNullOrEmpty() || OrderItem.ItemRefund.return_waybill_id.IsNullOrEmpty() || receiver.receiver_name.IsNullOrEmpty() || receiver.receiver_phone.IsNullOrEmpty() ||
|
||||||
receiver.receiver_province.IsNullOrEmpty() || receiver.receiver_city.IsNullOrEmpty() || receiver.receiver_area.IsNullOrEmpty() || receiver.receiver_address.IsNullOrEmpty())
|
receiver.receiver_province.IsNullOrEmpty() || receiver.receiver_city.IsNullOrEmpty() || receiver.receiver_area.IsNullOrEmpty() || receiver.receiver_address.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrWhiteSpace(aftersaleAddress))
|
if (!string.IsNullOrWhiteSpace(aftersaleAddress) || receiver.receiver_name.Length > 15)
|
||||||
{
|
{
|
||||||
// todo 提示地址解析失败请手动提交
|
// todo 提示地址解析失败请手动提交
|
||||||
OrderItem.AddEditTransitWarehouseReturnOrderStr = "解析失败请手动添加";
|
OrderItem.AddEditTransitWarehouseReturnOrderStr = "解析失败请手动添加";
|
||||||
|
|||||||
@@ -703,6 +703,11 @@ namespace AllBase.Model.DBModel
|
|||||||
IsWaitBuy = GetIsWaitBuy();
|
IsWaitBuy = GetIsWaitBuy();
|
||||||
IsWaitSend = GetIsWaitSend();
|
IsWaitSend = GetIsWaitSend();
|
||||||
IsWaitReceive = GetIsWaitReceive();
|
IsWaitReceive = GetIsWaitReceive();
|
||||||
|
|
||||||
|
if (order_id == "3739089000222605568")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
isAbnormal = GetIsAbnormal();
|
isAbnormal = GetIsAbnormal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -777,6 +782,11 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public bool GetIsAbnormal()
|
public bool GetIsAbnormal()
|
||||||
{
|
{
|
||||||
|
// 三退或者两退,为退款完成单
|
||||||
|
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
|
||||||
|
// (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
|
||||||
|
// return false;
|
||||||
|
|
||||||
// 如果有售后,直接作为售后单处理
|
// 如果有售后,直接作为售后单处理
|
||||||
if (orderItems.All(oi => oi.refund_status > 1))
|
if (orderItems.All(oi => oi.refund_status > 1))
|
||||||
return false;
|
return false;
|
||||||
@@ -785,7 +795,6 @@ namespace AllBase.Model.DBModel
|
|||||||
return false;
|
return false;
|
||||||
if (gift_order_status == 1 || gift_order_status == 2)
|
if (gift_order_status == 1 || gift_order_status == 2)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
|
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
|||||||
@@ -345,18 +345,38 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 关闭中转包裹退回,改为中转分销退货
|
// 关闭中转包裹退回,改为中转分销退货
|
||||||
|
//if (AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||||
|
// AddEditTransitWarehouseAfterSaleStr = "";
|
||||||
|
//AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
|
||||||
|
//if (DistribReturnOrderInfo?.warehouse_status == 1)
|
||||||
|
// AddEditTransitWarehouseReturnOrderStr = "已创建";
|
||||||
|
//if (DistribReturnOrderInfo?.warehouse_status == 2)
|
||||||
|
// AddEditTransitWarehouseReturnOrderStr = "创建异常";
|
||||||
|
//if (DistribReturnOrderInfo?.warehouse_status == 3)
|
||||||
|
// AddEditTransitWarehouseReturnOrderStr = "处理中";
|
||||||
|
//if (TransitRefundStatusStr.Contains("退款成功"))
|
||||||
|
//{
|
||||||
|
// if (AddEditTransitWarehouseReturnOrderStr == "添加")
|
||||||
|
// AddEditTransitWarehouseReturnOrderStr = "";
|
||||||
|
//}
|
||||||
|
|
||||||
if (AddEditTransitWarehouseAfterSaleStr == "添加")
|
if (AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||||
AddEditTransitWarehouseAfterSaleStr = "";
|
AddEditTransitWarehouseAfterSaleStr = "";
|
||||||
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
|
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "未创建" : "已添加";
|
||||||
if (DistribReturnOrderInfo?.warehouse_status == 1)
|
if (DistribReturnOrderInfo?.warehouse_status == 1)
|
||||||
AddEditTransitWarehouseReturnOrderStr = "已创建";
|
{
|
||||||
|
if ((DistribReturnOrderInfo?.real_logistics_express_code).IsNullOrEmpty())
|
||||||
|
AddEditTransitWarehouseReturnOrderStr = "已到仓";
|
||||||
|
else
|
||||||
|
AddEditTransitWarehouseReturnOrderStr = "已发回";
|
||||||
|
}
|
||||||
if (DistribReturnOrderInfo?.warehouse_status == 2)
|
if (DistribReturnOrderInfo?.warehouse_status == 2)
|
||||||
AddEditTransitWarehouseReturnOrderStr = "创建异常";
|
AddEditTransitWarehouseReturnOrderStr = "创建失败";
|
||||||
if (DistribReturnOrderInfo?.warehouse_status == 3)
|
if (DistribReturnOrderInfo?.warehouse_status == 3)
|
||||||
AddEditTransitWarehouseReturnOrderStr = "处理中";
|
AddEditTransitWarehouseReturnOrderStr = "已创建未到仓";
|
||||||
if (TransitRefundStatusStr.Contains("退款成功"))
|
if (TransitRefundStatusStr.Contains("退款成功"))
|
||||||
{
|
{
|
||||||
if (AddEditTransitWarehouseReturnOrderStr == "添加")
|
if (AddEditTransitWarehouseReturnOrderStr == "未创建")
|
||||||
AddEditTransitWarehouseReturnOrderStr = "";
|
AddEditTransitWarehouseReturnOrderStr = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -961,7 +981,11 @@ namespace AllBase.Model.DBModel
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public Visibility PurchasePriceVisibility
|
public Visibility PurchasePriceVisibility
|
||||||
{
|
{
|
||||||
get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
get
|
||||||
|
{
|
||||||
|
//if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible;
|
||||||
|
return Visibility.Collapsed;
|
||||||
|
}
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -978,10 +1002,10 @@ namespace AllBase.Model.DBModel
|
|||||||
/// 运费文本是否可见
|
/// 运费文本是否可见
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Visibility FreightVisibility
|
public Visibility FreightVisibility
|
||||||
{
|
{
|
||||||
get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
//get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||||
//get { if (ItemOrder.freight > 0) return Visibility.Visible; return Visibility.Collapsed; }
|
get { return Visibility.Collapsed; }
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -1171,6 +1195,13 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string RefundStatusStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.RefundStatusStr); }
|
||||||
|
set { this.SetValue(x => x.RefundStatusStr, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单商品表数据库id
|
/// 订单商品表数据库id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -1312,7 +1343,24 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消)
|
/// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? refund_status { get; set; }
|
public int? refund_status
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.refund_status); }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
this.SetValue(x => x.refund_status, value);
|
||||||
|
if (value == 1)
|
||||||
|
RefundStatusStr = "无售后/售后关闭";
|
||||||
|
else if (value == 2)
|
||||||
|
RefundStatusStr = "售后处理中";
|
||||||
|
else if (value == 3)
|
||||||
|
RefundStatusStr = "退款中";
|
||||||
|
else if (value == 4)
|
||||||
|
RefundStatusStr = "退款成功";
|
||||||
|
else if (value == 11)
|
||||||
|
RefundStatusStr = "售后完成订单取消";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void SetOrderItemTextProperty()
|
public void SetOrderItemTextProperty()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -203,7 +203,10 @@ namespace AllBase.Model.Result
|
|||||||
set
|
set
|
||||||
{
|
{
|
||||||
_specs = value;
|
_specs = value;
|
||||||
SpecNameStr = string.Join(",", value.Select(s => s.spec_value));
|
if (value != null)
|
||||||
|
SpecNameStr = string.Join(",", value.Select(s => s.spec_value));
|
||||||
|
else
|
||||||
|
SpecNameStr = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public int? price { get; set; } // 0,
|
public int? price { get; set; } // 0,
|
||||||
|
|||||||
Reference in new issue
Block a user