售后单逻辑调整。

This commit is contained in:
wule committed 2026-07-14 12:07:53 +08:00
1 parent 5571d227c8
commit ed3545e376
14 files changed
+264 -115

No files matched your search

+1 -1
View File
@@ -59,7 +59,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\WxFindOrder155\</OutputPath> <OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
@@ -781,11 +781,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
else else
{ {
var index = lstPddBuyerOrderInfoLite.IndexOf(orderExist); var index = lstFilterPddBuyerOrderInfoLite.IndexOf(orderExist);
Dispatcher.Invoke(new Action(() => Dispatcher.Invoke(new Action(() =>
{ {
lstPddBuyerOrderInfoLite.Remove(orderExist); lstFilterPddBuyerOrderInfoLite.Remove(orderExist);
lstPddBuyerOrderInfoLite.Insert(index, order); lstFilterPddBuyerOrderInfoLite.Insert(index, order);
})); }));
} }
} }
@@ -979,6 +979,34 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
afterSale.PreAllocatedOrderNoStr = af.PreAllocatedOrderNoStr; afterSale.PreAllocatedOrderNoStr = af.PreAllocatedOrderNoStr;
afterSale.ShopOrderRefundStr = af.ShopOrderRefundStr; afterSale.ShopOrderRefundStr = af.ShopOrderRefundStr;
//afterSale.wxRefundStatus = af.wxRefundStatus; //afterSale.wxRefundStatus = af.wxRefundStatus;
// 移除,添加 自动更新列表显示
var index = lstPddBuyerAfterSaleInfoLite.IndexOf(afterSale);
Dispatcher.Invoke(new Action(() =>
{
lstPddBuyerAfterSaleInfoLite.Remove(afterSale);
lstPddBuyerAfterSaleInfoLite.Insert(index, afterSale);
}));
}
}
if (filterOneBuyerAfterSale(afterSale))
{
var afterSaleExist = lstFilterPddBuyerAfterSaleInfoLite.FirstOrDefault(afe => afe.orderSn == afterSale.orderSn);
if (afterSaleExist == null)
{
Dispatcher.Invoke(new Action(() =>
{
lstFilterPddBuyerAfterSaleInfoLite.Add(afterSale);
}));
}
else
{
var index = lstFilterPddBuyerAfterSaleInfoLite.IndexOf(afterSaleExist);
Dispatcher.Invoke(new Action(() =>
{
lstFilterPddBuyerAfterSaleInfoLite.Remove(afterSaleExist);
lstFilterPddBuyerAfterSaleInfoLite.Insert(index, afterSale);
}));
} }
} }
@@ -161,7 +161,19 @@
<TabItem Header="待发货" MinWidth="100" SizeChanged="TabItem_SizeChanged"></TabItem> <TabItem Header="待发货" MinWidth="100" SizeChanged="TabItem_SizeChanged"></TabItem>
<TabItem Header="待收货" MinWidth="100" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem> <TabItem Header="待收货" MinWidth="100" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
<TabItem Header="退款单" MinWidth="100" Foreground="#FF9966" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem> <TabItem Header="退款单" MinWidth="100" Foreground="#FF9966" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
<TabItem Header="紧急单" MinWidth="100" Foreground="#FF6666" BorderBrush="Transparent" Background="#FF6666" SizeChanged="TabItem_SizeChanged"></TabItem> <TabItem Header="紧急单" MinWidth="100" Foreground="#FF6666" BorderBrush="Transparent" Background="#FF6666" SizeChanged="TabItem_SizeChanged">
<Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition>
<ColumnDefinition Width="auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<CheckBox Content="买手需手动退货" x:Name="chkWaitOperate" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
VerticalAlignment="Center" Margin="6,8" Click="chkWaitOperate_Click"/>
</Grid>
</Border>
</TabItem>
<TabItem Header="全部订单" MinWidth="110" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem> <TabItem Header="全部订单" MinWidth="110" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
<!--<TabItem Header="发货异常"> <!--<TabItem Header="发货异常">
<Grid Background="#FFE5E5E5"/> <Grid Background="#FFE5E5E5"/>
@@ -202,9 +214,9 @@
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Width="200*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="店铺单号"/> <DataGridTextColumn Width="200*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="店铺单号"/>
<DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="交易时间"/> <DataGridTextColumn Width="95*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="交易时间"/>
<DataGridTextColumn Width="80*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="利润"/> <DataGridTextColumn Width="75*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="利润"/>
<DataGridTextColumn Width="160*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="状态/地址"/> <DataGridTextColumn Width="170*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="状态/地址"/>
<DataGridTextColumn Width="110*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/> <DataGridTextColumn Width="110*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
<DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="备注"/> <DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="备注"/>
<DataGridTextColumn Width="82*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header=" 操作"/> <DataGridTextColumn Width="82*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header=" 操作"/>
@@ -36,7 +36,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
public CheckBox chkSelectAll = null; public CheckBox chkSelectAll = null;
public string headerStr { get; set; } = "";
public bool IsAutoReadOrder = true; public bool IsAutoReadOrder = true;
public DateTime nextGetOrderTime = DateTime.MinValue; public DateTime nextGetOrderTime = DateTime.MinValue;
@@ -376,36 +375,41 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
public void disPlayOrderTabOrderCount() public void disPlayOrderTabOrderCount()
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, false)));
var tabItems = this.tabOrderType.Items.Cast<TabItem>(); var tabItems = this.tabOrderType.Items.Cast<TabItem>();
var tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); var tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购"));
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "待采购")));
tabItem.Header = "待采购(" + GlobalConfig.lstOrder.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Where(r => r.IsWaitBuy).Count() + ")"; tabItem.Header = "待采购(" + GlobalConfig.lstOrder.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Where(r => r.IsWaitBuy).Count() + ")";
} }
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货")); tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货"));
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "待发货")));
tabItem.Header = "待发货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Where(r => r.IsWaitSend).Count() + ")"; tabItem.Header = "待发货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Where(r => r.IsWaitSend).Count() + ")";
} }
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货")); tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货"));
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "待收货")));
tabItem.Header = "待收货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Where(r => r.IsWaitReceive).Count() + ")"; tabItem.Header = "待收货(" + GlobalConfig.lstOrder.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Where(r => r.IsWaitReceive).Count() + ")";
} }
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单")); tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "退款单")));
tabItem.Header = "退款单(" + GlobalConfig.lstOrder.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Where(r => r.IsRefund).Count() + ")"; tabItem.Header = "退款单(" + GlobalConfig.lstOrder.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Where(r => r.IsRefund).Count() + ")";
} }
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("紧急单")); tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("紧急单"));
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "紧急单")));
tabItem.Header = "紧急单(" + GlobalConfig.lstOrder.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Where(r => r.IsEmergency).Count() + ")"; tabItem.Header = "紧急单(" + GlobalConfig.lstOrder.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Where(r => r.IsEmergency).Count() + ")";
} }
tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单")); tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
if (tabItem != null) if (tabItem != null)
{ {
var filteLstTmp = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o, "全部订单")));
tabItem.Header = "全部订单(" + GlobalConfig.lstOrder.Count() + "|" + filteLstTmp.Count() + ")"; tabItem.Header = "全部订单(" + GlobalConfig.lstOrder.Count() + "|" + filteLstTmp.Count() + ")";
} }
txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录"; txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
@@ -470,8 +474,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
} }
} }
bool GetOrderIsFilter(oms_wei_order_info order, string filterHeadStr = null)
bool GetOrderIsFilter(oms_wei_order_info order, bool isFilterTab = true)
{ {
if (order == null) if (order == null)
return true; return true;
@@ -506,33 +509,42 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return true; return true;
// 过滤标签页 // 过滤标签页
if (isFilterTab) if (filterHeadStr.IsNullOrEmpty())
filterHeadStr = GlobalConfig.OrderTabHeaderStr;
if (filterHeadStr.StartsWith("全部订单"))
{ {
if (headerStr.StartsWith("待采购")) return false;
{ }
if (!order.IsWaitBuy) if (filterHeadStr.StartsWith("待采购"))
return true; {
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null)) if (!order.IsWaitBuy)
return true;
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
return true;
}
if (headerStr.StartsWith("待发货") && !order.IsWaitSend)
{
return true; return true;
} if (order.IsRefund)
if (headerStr.StartsWith("待收货") && !order.IsWaitReceive)
{
return true; return true;
} if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
if (headerStr.StartsWith("退款单") && !order.IsRefund)
{
return true; return true;
} if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
if (headerStr.StartsWith("紧急单") && !order.IsEmergency) return true;
{ }
if (filterHeadStr.StartsWith("待发货") && !order.IsWaitSend)
{
return true;
}
if (filterHeadStr.StartsWith("待收货") && !order.IsWaitReceive)
{
return true;
}
if (filterHeadStr.StartsWith("退款单") && !order.IsRefund)
{
return true;
}
if (filterHeadStr.StartsWith("紧急单"))
{
if (!order.IsEmergency)
return true;
if (chkWaitOperate.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
return true; return true;
}
} }
return false; return false;
@@ -653,7 +665,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private void tabOrderType_SelectionChanged(object sender, SelectionChangedEventArgs e) private void tabOrderType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
headerStr = ((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString(); GlobalConfig.OrderTabHeaderStr = ((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString();
FilterOrders(); FilterOrders();
} }
@@ -697,5 +709,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
FilterOrders(); FilterOrders();
} }
private void chkWaitOperate_Click(object sender, RoutedEventArgs e)
{
FilterOrders();
}
} }
} }
@@ -114,15 +114,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private void Path_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void Path_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {
var orderId = ((sender as Border)?.Tag).ParseToString(); //var orderId = ((sender as Border)?.Tag).ParseToString();
try if (this.DataContext is oms_wei_order_info order)
{ {
Clipboard.SetText(orderId);
BaseMsgWindow.ShowAnimateMessage("复制成功"); try
} {
catch (Exception ex) Clipboard.SetText(order.order_id);
{ BaseMsgWindow.ShowAnimateMessage("复制成功");
BaseMsgWindow.ShowError("复制失败 " + ex.Message); }
catch (Exception ex)
{
BaseMsgWindow.ShowError("复制失败 " + ex.Message);
}
} }
} }
@@ -167,8 +167,8 @@
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding OrderItemStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" <TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding OrderItemStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center"
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding OrderItemStatusStr}" BorderThickness="0" /> Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding OrderItemStatusStr}" BorderThickness="0" />
</Border> </Border>
<TextBox Text="{Binding ItemRefund.statusStr}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" <TextBox Text="{Binding ItemRefund.RefundStatusStr}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
x:Name="txtStatusStr" BorderThickness="0" Foreground="{Binding ItemRefund.refundStatusColor}" HorizontalAlignment="Center" x:Name="txtStatusStr" BorderThickness="0" Foreground="{Binding ItemRefund.RefundStatusColor}" HorizontalAlignment="Center"
Visibility="{Binding ElementName=txtStatusStr,Path=Text,Converter={StaticResource HasTextVisibility}}"/> Visibility="{Binding ElementName=txtStatusStr,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
<TextBox Text="{Binding ItemRefund.reasonTextStr}" Grid.Column="1" Grid.Row="3" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" <TextBox Text="{Binding ItemRefund.reasonTextStr}" Grid.Column="1" Grid.Row="3" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
x:Name="txtRefundReasonTextStr" BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center" x:Name="txtRefundReasonTextStr" BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"
@@ -216,16 +216,23 @@
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border x:Name="borderRefundStatas" Grid.Row="1" Margin="0,0,0,2" Background="{Binding TransitRefundStatusBackColor}" BorderBrush="{Binding TransitRefundStatusBackColor}" <WrapPanel x:Name="wpTransitBuyerRefundStatus" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
<Border x:Name="borderTransitBuyerRefundStatus" Grid.Row="1" Margin="0,0,0,2" Background="{Binding TransitRefundStatusBackColor}" BorderBrush="{Binding TransitRefundStatusBackColor}"
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitRefundStatusStr,Converter={StaticResource HasTextVisibility}}"> BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitRefundStatusStr,Converter={StaticResource HasTextVisibility}}">
<TextBox x:Name="txtRefundStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" <TextBox x:Name="txtRefundStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center"
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitRefundStatusStr}" BorderThickness="0" /> Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitRefundStatusStr}" BorderThickness="0" Padding="0" />
</Border> </Border>
<WrapPanel Grid.Row="2" HorizontalAlignment="Center"> <Border Grid.Row="1" Margin="4,0,0,2" Background="{StaticResource pageColorBrush}" BorderBrush="{StaticResource pageColorBrush}"
<Border x:Name="borderBuyStatas" Grid.Row="1" Margin="0,0,0,0" Background="{Binding BuyerWaybillStatusBackColor}" BorderBrush="{Binding BuyerWaybillStatusBorderColor}" BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitRefundVoidStatusStr,Converter={StaticResource HasTextVisibility}}">
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding BuyerWaybillStatusStr,Converter={StaticResource HasTextVisibility}}"> <TextBox Grid.Column="1" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center"
<TextBox x:Name="txtBuyStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding BuyerWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitRefundVoidStatusStr}" BorderThickness="0" Padding="0" />
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding BuyerWaybillStatusStr}" BorderThickness="0" /> </Border>
</WrapPanel>
<WrapPanel x:Name="wpTransitWaybillStatus" Grid.Row="2" HorizontalAlignment="Center">
<Border x:Name="borderBuyStatas" Grid.Row="1" Margin="0,0,0,0" Background="{Binding BuyerTransitWaybillStatusBackColor}" BorderBrush="{Binding BuyerTransitWaybillStatusBorderColor}"
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding BuyerTransitWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
<TextBox x:Name="txtBuyStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding BuyerTransitWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center"
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding BuyerTransitWaybillStatusStr}" BorderThickness="0" />
</Border> </Border>
<Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="4,0,0,0" Background="{Binding WarehouseWaybillStatusBackColor}" BorderBrush="{Binding WarehouseWaybillStatusBorderColor}" <Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="4,0,0,0" Background="{Binding WarehouseWaybillStatusBackColor}" BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding WarehouseWaybillStatusStr,Converter={StaticResource HasTextVisibility}}"> BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding WarehouseWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
@@ -533,11 +533,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
btnDeleteTransitOrder.Visibility = Visibility.Visible; btnDeleteTransitOrder.Visibility = Visibility.Visible;
} }
if (MainWindow.Instance.orderListCtrl.headerStr.StartsWith("待采购")) //待采购不显示所有采购信息状态(否则会显示作废订单状态)
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
{ {
wpBuyAccount.Visibility = Visibility.Collapsed; wpBuyAccount.Visibility = Visibility.Collapsed;
wpBuyOrderId.Visibility = Visibility.Collapsed; wpBuyOrderId.Visibility = Visibility.Collapsed;
wpBuyTime.Visibility = Visibility.Collapsed; wpBuyTime.Visibility = Visibility.Collapsed;
wpTransitWaybillStatus.Visibility = Visibility.Collapsed;
wpTransitBuyerRefundStatus.Visibility = Visibility.Collapsed;
} }
} }
else else
+1 -1
View File
@@ -22,7 +22,7 @@ namespace AllBase
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 157; public static int VersionCount = 159;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000";
+7
View File
@@ -23,6 +23,9 @@ namespace AllBase.Helper
/// 拼多多买手列表 /// 拼多多买手列表
/// </summary> /// </summary>
public static ObservableCollection<BuyerLoginInfo> PDDBuyerLoginList { get; set; } = new ObservableCollection<BuyerLoginInfo>(); public static ObservableCollection<BuyerLoginInfo> PDDBuyerLoginList { get; set; } = new ObservableCollection<BuyerLoginInfo>();
/// <summary>
/// 当前拼多多买手
/// </summary>
public static BuyerLoginInfo CurrentPddBuyer { get; set; } public static BuyerLoginInfo CurrentPddBuyer { get; set; }
/// <summary> /// <summary>
/// 订单列表 /// 订单列表
@@ -32,6 +35,10 @@ namespace AllBase.Helper
/// 过滤的订单列表 /// 过滤的订单列表
/// </summary> /// </summary>
public static ObservableCollection<oms_wei_order_info> lstFilterOrder { get; set; } = new ObservableCollection<oms_wei_order_info>(); public static ObservableCollection<oms_wei_order_info> lstFilterOrder { get; set; } = new ObservableCollection<oms_wei_order_info>();
/// <summary>
/// 当前标签头
/// </summary>
public static string OrderTabHeaderStr { get; set; } = "";
public static SystemSettings SystemSettings { get; set; } public static SystemSettings SystemSettings { get; set; }
@@ -54,8 +54,29 @@ namespace AllBase.Model.Local
public int? pre_allocated_order_no { get; set; } public int? pre_allocated_order_no { get; set; }
public int? is_transfer_ship { get; set; } public int? is_transfer_ship { get; set; }
/// <summary>
/// 溯源码
/// </summary>
public string random_code { get; set; } public string random_code { get; set; }
/// <summary>
/// 1, "拒收" 2, "拦截" 3, "取消" 4, "订单作废"
/// </summary>
public int? transfer_refund_status { get; set; } public int? transfer_refund_status { get; set; }
/// <summary>
/// 订单作废状态:0=正常,1=已作废,2=作废失败
/// </summary>
public int? order_void_status { get; set; } public int? order_void_status { get; set; }
/// <summary>
/// 中转仓入库状态 0: 未使用, 1: 已入库, 2: 已出库
/// </summary>
public int? warehouse_status { get; set; }
/// <summary>
/// 中转入库时间
/// </summary>
public DateTime? inbound_time { get; set; }
/// <summary>
/// 中转出库时间
/// </summary>
public DateTime? outbound_time { get; set; }
} }
} }
+6 -5
View File
@@ -78,7 +78,7 @@ namespace AllBase.Model.Local
/// </summary> /// </summary>
public bool IsRefund public bool IsRefund
{ {
get { return refundItems?.Count > 0; } get { return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); }
set { } set { }
} }
/// <summary> /// <summary>
@@ -164,12 +164,13 @@ namespace AllBase.Model.Local
{ {
get get
{ {
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.statusStr))) if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
return "退款中"; return "退款中";
else if (this.refundItems.Any(r => r.statusStr == "退款完成" || r.statusStr == "退货退款完成")) else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
return "退款完成"; return "退款完成";
else if (this.refundItems.Any(r => !r.statusStr.IsNullOrEmpty())) // 用户取消申请
return this.refundItems.FirstOrDefault(r => !r.statusStr.IsNullOrEmpty()).statusStr; else if (GlobalConfig.OrderTabHeaderStr.StartsWith("退款单") && this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
if (this.status == 20 || this.status == 21) if (this.status == 20 || this.status == 21)
{ {
return "剩余"; return "剩余";
+84 -50
View File
@@ -146,40 +146,50 @@ namespace AllBase.Model.Local
} }
set { } set { }
} }
public string BuyerTransitWaybillStatusStr
public string BuyerWaybillStatusStr
{ {
get get
{ {
if (PddBuyerOrder?.wx_order_id == "3737683253753151488") if (PddBuyerOrder?.wx_order_id == "3737683253753151488")
{ {
} }
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("退款成功"))
string refund_status = (ItemTransitOrderWithVoid?.refund_status).ParseToString();
//if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("退款成功"))
//{
// return "买手已退款";
//}
//else if (refund_status.Contains("退款成功"))
//{
// return "买手已退款";
//}
// 已到中转仓的或者中转仓已正式发出的,买手(仓上游)状态显示为已到中转仓
if (ItemTransitOrderWithVoid?.warehouse_status == 1 || ItemTransitOrderWithVoid?.warehouse_status == 2)
{ {
return "买手已退款"; return "已到中转仓";
} }
// 拼多多买手状态为已签收的,为已到中转仓
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收")) else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
{ {
return "已到中转仓"; return "已到中转仓";
} }
// 售后待用户退回商品的,至少为买手已发货
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待用户退回商品")) else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待用户退回商品"))
{ {
return "已到中转仓"; return "买手已发货";
} }
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待收货")) else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待收货"))
{ {
return "买手已发货"; return "买手已发货";
} }
// 有退款还没完成的,至少为买手已发货
var ref_status = (ItemTransitOrderWithVoid?.refund_status).ParseToString(); if (!refund_status.Contains("退款成功") && refund_status.Length > 0)
if (ref_status.Contains("退款成功"))
{
return "买手已退款";
}
if (!ref_status.Contains("退款成功") && ref_status.Length > 0)
{ {
return "买手已发货"; return "买手已发货";
} }
// 正式取号或者取号更正的,可认定买手已发货
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return "买手已发货"; return "买手已发货";
if (ItemTransitOrderWithVoid != null) if (ItemTransitOrderWithVoid != null)
@@ -188,49 +198,49 @@ namespace AllBase.Model.Local
} }
set { } set { }
} }
public SolidColorBrush BuyerWaybillStatusStrColor public SolidColorBrush BuyerTransitWaybillStatusStrColor
{ {
get get
{ {
if (BuyerWaybillStatusStr.StartsWith("买手已退款")) if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
return new SolidColorBrush(Color.FromRgb(152, 96, 143)); return new SolidColorBrush(Color.FromRgb(152, 96, 143));
if (BuyerWaybillStatusStr.StartsWith("已到中转仓")) if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102)); return new SolidColorBrush(Color.FromRgb(19, 206, 102));
if (BuyerWaybillStatusStr.StartsWith("买手已发货")) if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
return new SolidColorBrush(Color.FromRgb(255, 186, 0)); return new SolidColorBrush(Color.FromRgb(255, 186, 0));
if (BuyerWaybillStatusStr.StartsWith("买手未发货")) if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
return new SolidColorBrush(Color.FromRgb(255, 73, 73)); return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return new SolidColorBrush(Color.FromRgb(255, 73, 73)); return new SolidColorBrush(Color.FromRgb(255, 73, 73));
} }
set { } set { }
} }
public SolidColorBrush BuyerWaybillStatusBorderColor public SolidColorBrush BuyerTransitWaybillStatusBorderColor
{ {
get get
{ {
if (BuyerWaybillStatusStr.StartsWith("买手已退款")) if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143)); return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
if (BuyerWaybillStatusStr.StartsWith("已到中转仓")) if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
return new SolidColorBrush(Color.FromRgb(208, 245, 224)); return new SolidColorBrush(Color.FromRgb(208, 245, 224));
if (BuyerWaybillStatusStr.StartsWith("买手已发货")) if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
return new SolidColorBrush(Color.FromRgb(255, 241, 204)); return new SolidColorBrush(Color.FromRgb(255, 241, 204));
if (BuyerWaybillStatusStr.StartsWith("买手未发货")) if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
return new SolidColorBrush(Color.FromRgb(255, 219, 219)); return new SolidColorBrush(Color.FromRgb(255, 219, 219));
return new SolidColorBrush(Color.FromRgb(255, 219, 219)); return new SolidColorBrush(Color.FromRgb(255, 219, 219));
} }
set { } set { }
} }
public SolidColorBrush BuyerWaybillStatusBackColor public SolidColorBrush BuyerTransitWaybillStatusBackColor
{ {
get get
{ {
if (BuyerWaybillStatusStr.StartsWith("买手已退款")) if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143)); return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
if (BuyerWaybillStatusStr.StartsWith("已到中转仓")) if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
return new SolidColorBrush(Color.FromRgb(231, 250, 240)); return new SolidColorBrush(Color.FromRgb(231, 250, 240));
if (BuyerWaybillStatusStr.StartsWith("买手已发货")) if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
return new SolidColorBrush(Color.FromRgb(255, 248, 230)); return new SolidColorBrush(Color.FromRgb(255, 248, 230));
if (BuyerWaybillStatusStr.StartsWith("买手未发货")) if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
return new SolidColorBrush(Color.FromRgb(255, 237, 237)); return new SolidColorBrush(Color.FromRgb(255, 237, 237));
return new SolidColorBrush(Color.FromRgb(255, 237, 237)); return new SolidColorBrush(Color.FromRgb(255, 237, 237));
} }
@@ -246,18 +256,30 @@ namespace AllBase.Model.Local
} }
if (ItemTransitOrderWithVoid?.order_void_status == 2) if (ItemTransitOrderWithVoid?.warehouse_status == 2)
return "中转作废失败"; return "中转已出库";
if (ItemTransitOrderWithVoid?.order_void_status == 1) // 老订单还用之前的逻辑判断
return "中转已作废"; if (ItemTransitOrderWithVoid?.created_time < new DateTime(2026, 7, 14) && (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
if ((ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty()) //return "中转已出库*";
return "中转已发货"; return "中转已出库";
if (ItemTransitOrderWithVoid?.warehouse_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 (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
// return "中转待发货";
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return "待中转发货"; return "中转已取号";
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 2) if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 2)
return "中转提前取号"; return "中转提前取号";
//if (ItemTransitOrderWithVoid?.order_void_status == 2)
// return "中转作废失败";
//if (ItemTransitOrderWithVoid?.order_void_status == 1)
// return "中转已作废";
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 0) if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 0)
return "待中转取号"; return "中转待取号";
return ""; return "";
} }
set { } set { }
@@ -266,13 +288,13 @@ namespace AllBase.Model.Local
{ {
get get
{ {
if (WarehouseWaybillStatusStr.StartsWith("中转已作废")) //if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
return new SolidColorBrush(Color.FromRgb(152, 96, 143)); // return new SolidColorBrush(Color.FromRgb(152, 96, 143));
if (WarehouseWaybillStatusStr.StartsWith("中转已发货")) if (WarehouseWaybillStatusStr.StartsWith("中转已出库"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102)); return new SolidColorBrush(Color.FromRgb(19, 206, 102));
if (WarehouseWaybillStatusStr.StartsWith("待中转发货") || WarehouseWaybillStatusStr.StartsWith("中转提前取号")) if (WarehouseWaybillStatusStr.StartsWith("中转已入库") || WarehouseWaybillStatusStr.StartsWith("中转已取号") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 186, 0)); return new SolidColorBrush(Color.FromRgb(255, 186, 0));
if (WarehouseWaybillStatusStr.StartsWith("待中转取号")) if (WarehouseWaybillStatusStr.StartsWith("中转待取号"))
return new SolidColorBrush(Color.FromRgb(255, 73, 73)); return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return new SolidColorBrush(Color.FromRgb(255, 73, 73)); return new SolidColorBrush(Color.FromRgb(255, 73, 73));
} }
@@ -282,13 +304,13 @@ namespace AllBase.Model.Local
{ {
get get
{ {
if (WarehouseWaybillStatusStr.StartsWith("中转已作废")) //if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143)); // return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
if (WarehouseWaybillStatusStr.StartsWith("中转已发货")) if (WarehouseWaybillStatusStr.StartsWith("中转已出库"))
return new SolidColorBrush(Color.FromRgb(208, 245, 224)); return new SolidColorBrush(Color.FromRgb(208, 245, 224));
if (WarehouseWaybillStatusStr.StartsWith("待中转发货") || WarehouseWaybillStatusStr.StartsWith("中转提前取号")) if (WarehouseWaybillStatusStr.StartsWith("中转已入库") || WarehouseWaybillStatusStr.StartsWith("中转已取号") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 241, 204)); return new SolidColorBrush(Color.FromRgb(255, 241, 204));
if (WarehouseWaybillStatusStr.StartsWith("待中转取号")) if (WarehouseWaybillStatusStr.StartsWith("中转待取号"))
return new SolidColorBrush(Color.FromRgb(255, 219, 219)); return new SolidColorBrush(Color.FromRgb(255, 219, 219));
return new SolidColorBrush(Color.FromRgb(255, 219, 219)); return new SolidColorBrush(Color.FromRgb(255, 219, 219));
} }
@@ -298,13 +320,13 @@ namespace AllBase.Model.Local
{ {
get get
{ {
if (WarehouseWaybillStatusStr.StartsWith("中转已作废")) //if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143)); // return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
if (WarehouseWaybillStatusStr.StartsWith("中转已发货")) if (WarehouseWaybillStatusStr.StartsWith("中转已出库"))
return new SolidColorBrush(Color.FromRgb(231, 250, 240)); return new SolidColorBrush(Color.FromRgb(231, 250, 240));
if (WarehouseWaybillStatusStr.StartsWith("待中转发货") || WarehouseWaybillStatusStr.StartsWith("中转提前取号")) if (WarehouseWaybillStatusStr.StartsWith("中转已入库") || WarehouseWaybillStatusStr.StartsWith("中转已取号") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 248, 230)); return new SolidColorBrush(Color.FromRgb(255, 248, 230));
if (WarehouseWaybillStatusStr.StartsWith("待中转取号")) if (WarehouseWaybillStatusStr.StartsWith("中转待取号"))
return new SolidColorBrush(Color.FromRgb(255, 237, 237)); return new SolidColorBrush(Color.FromRgb(255, 237, 237));
return new SolidColorBrush(Color.FromRgb(255, 237, 237)); return new SolidColorBrush(Color.FromRgb(255, 237, 237));
} }
@@ -343,6 +365,18 @@ namespace AllBase.Model.Local
} }
set { } set { }
} }
public string TransitRefundVoidStatusStr
{
get
{
//if (ItemTransitOrderWithVoid?.order_void_status == 2)
// return "中转作废失败";
if (ItemTransitOrderWithVoid?.order_void_status == 1)
return "中转已作废";
return "";
}
set { }
}
// 仓库采购时间是否达标字段 // 仓库采购时间是否达标字段
+4 -3
View File
@@ -9,7 +9,7 @@ namespace AllBase.Model.Local
{ {
public class oms_wei_refund_info public class oms_wei_refund_info
{ {
public string statusStr public string RefundStatusStr
{ {
get get
{ {
@@ -38,7 +38,7 @@ namespace AllBase.Model.Local
/// <summary> /// <summary>
/// 退款状态颜色 /// 退款状态颜色
/// </summary> /// </summary>
public SolidColorBrush refundStatusColor public SolidColorBrush RefundStatusColor
{ {
get get
{ {
@@ -46,7 +46,8 @@ namespace AllBase.Model.Local
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") status == "WAIT_PACKAGE_INTERCEPT")
return new SolidColorBrush(Color.FromRgb(230, 162, 60)); return new SolidColorBrush(Color.FromRgb(230, 162, 60));
if (status == "MERCHANT_REFUND_SUCCESS" || status == "MERCHANT_RETURN_SUCCESS") if (status == "MERCHANT_REFUND_SUCCESS" || status == "MERCHANT_RETURN_SUCCESS" ||
status == "USER_CANCELD" /*|| status == "MERCHANT_REJECT_REFUND" || status == "MERCHANT_REJECT_RETURN" || status == "RETURN_CLOSED" || status == "PLATFORM_REFUND_FAIL" || status == "MERCHANT_FAIL"*/)
return new SolidColorBrush(Color.FromRgb(103, 194, 58)); return new SolidColorBrush(Color.FromRgb(103, 194, 58));
return new SolidColorBrush(Color.FromRgb(245, 108, 108)); return new SolidColorBrush(Color.FromRgb(245, 108, 108));
} }
+15 -1
View File
@@ -456,6 +456,21 @@ namespace TemuKJD.ToolForms
})); }));
}); });
} }
if (url.Contains("alipay.com") && responseData.Contains("支付成功"))
{
Task.Run(() =>
{
var uri = url;
var pData = postData;
var rData = responseData;
Invoke(new Action(() =>
{
//txtBuyOrderId.Text = BaseRegex.GetStringJson(ref data, "order_sn");
btnManualUpdateBuyOrder_Click(null, null);
}));
});
}
} }
/// <summary> /// <summary>
@@ -753,7 +768,6 @@ namespace TemuKJD.ToolForms
//} //}
if (string.IsNullOrEmpty(txtBuyTransitWarehouse.Text.Trim())) if (string.IsNullOrEmpty(txtBuyTransitWarehouse.Text.Trim()))
{ {
BaseMsgForm.ShowError("缺少中转地址,请重新绑定商品并选择仓库地址"); BaseMsgForm.ShowError("缺少中转地址,请重新绑定商品并选择仓库地址");