拼多多买手直接退款 其他订单逻辑优化

This commit is contained in:
wule committed 2026-07-09 20:08:27 +08:00
1 parent 1669305479
commit b877695e4b
42 files changed
+1958 -1980

No files matched your search

@@ -28,8 +28,8 @@
<CheckBox Content="隐藏无微信订单的买手单" x:Name="chkHideNoWxIdOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
Margin="6,0" VerticalAlignment="Center" Checked="chkHideNoWxIdOrder_CheckedChanged" Unchecked="chkHideNoWxIdOrder_CheckedChanged" IsChecked="True"/>
<CheckBox Content="未发货单自动售后" x:Name="chkAutoAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" Visibility="Collapsed"
Margin="6,0" VerticalAlignment="Center" IsChecked="True"/>
<CheckBox Content="未发货订单自动售后" x:Name="chkAutoAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" Visibility="Visible"
Margin="6,0" VerticalAlignment="Center" IsChecked="True" Checked="chkAutoAfterSale_Checked" Unchecked="chkAutoAfterSale_Checked"/>
<Button Grid.Column="8" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="刷新订单" Width="118" Height="24" Click="btnSearch_Click"/>
</WrapPanel>
@@ -40,125 +40,188 @@
<Grid Grid.Row="1" Background="LightGray" x:Name="GridCef">
</Grid>
<Grid Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible" Height="330" Margin="4" Background="White">
<Grid Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible" Margin="0" Background="Transparent">
<Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>
<Label Content="正在操作:" VerticalAlignment="Center" x:Name="lblMsg"></Label>
<DataGrid Grid.Row="1" RowHeight="50" AutoGenerateColumns = "False" HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}" x:Name="dgBuyerOrder" RowHeaderWidth="0"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}" CanUserDeleteRows="False" CanUserAddRows="False" ColumnHeaderHeight="30" LoadingRow="dgBuyerOrder_LoadingRow">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" CanUserSort="False" Header="序列" IsReadOnly="True" Width="40">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="拍单订单号" Binding="{Binding order_sn}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="店铺订单号" Binding="{Binding ShopOrderIdStr}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="买手名称" Binding="{Binding buyerName}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="拍单时间" Binding="{Binding OrderTimeStr}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1.8*" Header="商品信息" Binding="{Binding ProdInfoStr}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="金额" Binding="{Binding AmoutValue}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单状态" Binding="{Binding order_status_prompt}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="物流名称" Binding="{Binding outExpressCompanyCode}">
<!--outExpressCompanyName-->
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="物流单号" Binding="{Binding tracking_number}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单信息" Binding="{Binding sendStatus}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTemplateColumn Width="0.6*" Header="手动发送" x:Name="colSendBuyerOrder" >
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click" Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}"></Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
<Button Style="{StaticResource BasePageButtonStyle}" Margin="0,0,0,-10" Content="▼" VerticalContentAlignment="top" Width="60" Height="25" x:Name="btnHide" Click="btnHide_Click"/>
<Grid x:Name="gridTable" Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible" Height="330" Margin="2" Background="White">
<Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Label Content="正在操作:" Panel.ZIndex="1" Margin="180,0,0,0" VerticalAlignment="Center" x:Name="lblMsg"></Label>
<TabControl x:Name="tabOrderType" Grid.Row="1" Margin="0,-32,0,1" VerticalAlignment="Stretch" >
<TabControl.Resources>
<Style TargetType="{x:Type TabControl}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TabControl}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Border Grid.Row="1" Background="#f8f8f9" BorderThickness="1,1,1,0" BorderBrush="#e0e0e0" MinHeight="4" CornerRadius="0,4,0,0">
<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent"/>
</Border>
<Border HorizontalAlignment="Left" Background="#e8e8e9" BorderBrush="#e1e1e1" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0" Margin="0,0,0,0">
<TabPanel x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True"/>
</Border>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="TabItem">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TabItem">
<Border Name="Border" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0" Margin="-1,-2,-1,0">
<ContentPresenter x:Name="ContentSite" VerticalAlignment="Center" HorizontalAlignment="Center" ContentSource="Header" Margin="10,5"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="Border" Property="Background" Value="#f8f8f9"/>
<Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0"/>
<Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1"/>
<Setter Property="Foreground" Value="{StaticResource pageColorBrush}"/>
<Setter Property="Panel.ZIndex" Value="100"/>
</Trigger>
<Trigger Property="IsSelected" Value="False">
<Setter TargetName="Border" Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="#999999"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</TabControl.Resources>
<TabItem Header="买手订单">
<DataGrid Grid.Row="1" RowHeight="50" AutoGenerateColumns = "False" HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}" x:Name="dgBuyerOrder"
RowHeaderWidth="0" VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}" CanUserDeleteRows="False" CanUserAddRows="False"
ColumnHeaderHeight="30" LoadingRow="dgBuyerOrder_LoadingRow">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
CanUserSort="False" Header="序列" IsReadOnly="True" Width="40">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="拍单订单号" Binding="{Binding order_sn}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1.5*" Header="店铺订单号" Binding="{Binding ShopOrderIdStr}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="买手名称" Binding="{Binding buyerName}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="拍单时间" Binding="{Binding OrderTimeStr}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1.8*" Header="商品信息" Binding="{Binding ProdInfoStr}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="0.8*" Header="金额" Binding="{Binding AmoutValue}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单状态" Binding="{Binding order_status_prompt}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="物流名称" Binding="{Binding outExpressCompanyCode}">
<!--outExpressCompanyName-->
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="物流单号" Binding="{Binding tracking_number}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Width="1*" Header="订单信息" Binding="{Binding sendStatus}">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTemplateColumn Width="0.6*" Header="手动发送" x:Name="colSendBuyerOrder" >
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center"
Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}"></Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</TabItem>
<TabItem Header="买手退款"></TabItem>
</TabControl>
</Grid>
</Grid>
</Grid>
</Border>
@@ -51,14 +51,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
ConcurrentList<PddBuyerAfterSaleLiteInfo> lstPddBuyerAfterSaleInfoLite { get; set; } = new ConcurrentList<PddBuyerAfterSaleLiteInfo>();
public CancellationTokenSource cancellationTokenSource { get; set; } = new CancellationTokenSource();
//public ChromiumWebBrowser cefWebBrowser = null;
public BuyerOrderConfig buyerOrderConfig = new BuyerOrderConfig();
public BuyerReadOrderConfig buyerReadOrderConfig = new BuyerReadOrderConfig();
public DateTime nextGetOrderTime = DateTime.MinValue;
public DateTime lastCefReadOrderTime = DateTime.Now;
/// <summary>
/// 是否自动读买手单
/// </summary>
public bool IsAutoReadBuyerOrder = true;
/// <summary>
/// 是否正在读买手单
/// </summary>
bool isReadBuyerOrder = false;
@@ -129,18 +125,20 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return false;
if (isHideNoWxOrderNo && order.ShopOrderIdStr.IsNullOrEmpty())
return false;
if (!string.IsNullOrEmpty(filterTxt) && !order.order_sn.Contains(filterTxt) && !order.ShopOrderIdStr.Contains(filterTxt) && !order.tracking_number.Contains(filterTxt))
if (!string.IsNullOrEmpty(filterTxt) && !order.order_sn.Contains(filterTxt) && !order.ShopOrderIdStr.ParseToString().Contains(filterTxt) &&
!order.tracking_number.Contains(filterTxt) &&
!order.sendStatus.ParseToString().Contains(filterTxt))
return false;
return true;
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
buyerOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerOrderConfig>("pdd_buyer_order_config");
if (buyerOrderConfig == null)
buyerOrderConfig = new BuyerOrderConfig();
this.chkAutoReadBuyerOrder.IsChecked = !buyerOrderConfig.IsPause;
//this.chkAutoAfterSale.IsChecked = buyerOrderConfig.IsAutoAfterSale;
buyerReadOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerReadOrderConfig>("pdd_buyer_read_order_config");
if (buyerReadOrderConfig == null)
buyerReadOrderConfig = new BuyerReadOrderConfig();
this.chkAutoReadBuyerOrder.IsChecked = buyerReadOrderConfig.IsAutoReadOrder;
this.chkAutoAfterSale.IsChecked = buyerReadOrderConfig.IsAutoAfterSale;
lstPddBuyerOrderInfoLite = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ObservableCollection<PddBuyerOrderLiteInfo>>("pdd_buyer_order_list");
@@ -190,7 +188,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
Thread.Sleep(5000);
while (true)
{
if (!IsAutoReadBuyerOrder)
if (!buyerReadOrderConfig.IsAutoReadOrder)
{
Thread.Sleep(1000);
Dispatcher.Invoke(new Action(() =>
@@ -202,7 +200,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (DateTime.Now > nextGetOrderTime)
{
btnSearch_Click(null, null);
GetOrderAndAfterSale();
}
if (isReadBuyerOrder)
{
@@ -501,10 +499,91 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
//break;
}
List<oms_wei_external_procurement_log> transitOrderList = new List<oms_wei_external_procurement_log>();
try { transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString()); } catch { }
try
{
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString());
// 直接过滤掉仓库售后单
transitOrderList = transitOrderList.Where(t => t.transfer_refund_status.IsNullOrZero()).ToList();
}
catch
{
}
return transitOrderList;
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
{
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 1000;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
}
catch
{
}
var orderItems = GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_item_info> GetOrderItemInfo(string order_ids)
{
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_item_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 1000;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
try
{
orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item_info>(JObject.Parse(html1)["data"].ParseToString());
if (orderItems == null)
orderItems = new List<oms_wei_order_item_info>();
}
catch
{
}
return orderItems;
}
/// <summary>
/// 读取售后单
/// </summary>
@@ -513,7 +592,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
List<oms_wei_refund_info> GetOrderRefundInfo(string order_ids)
{
Thread.Sleep(100);
var url2 = BaseClass.Build29WxObjString("order/get_refund_list");
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
var data2 = UserLogin.GetSignaturex();
data2 += "&erp_order_id_in=" + order_ids;
var html2 = GetHtml.PostUtf8(url2, data2);
@@ -529,22 +608,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return refunds;
}
void UpdateOrderStatus(PddBuyerOrderLiteInfo o, oms_wei_order_item_info order_item, oms_wei_refund_info refund_item, oms_wei_external_procurement_log transitOrderList)
void UpdateOrderStatus(PddBuyerOrderLiteInfo pdd_order, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log wx_transit_order)
{
o.ShopOrderIdStr = order_item?.order_id ?? transitOrderList.order_no;
o.ShopOrderSkuIdStr = order_item?.sku_id ?? transitOrderList.order_sku_id;
o.ShopOrderSkuNameStr = order_item?.sku_attr_str;
o.ShopOrderRefundStr = refund_item?.count > 0 ? "店铺售后" : "";
o.TransitWarehouseIdStr = transitOrderList?.platform;
o.Express1WaybillStr = transitOrderList?.express_1_waybill;
o.Express1CompanyStr = transitOrderList?.express_1_company;
o.Express2WaybillStr = transitOrderList?.express_2_waybill;
o.Express2CompanyStr = transitOrderList?.express_2_company;
o.TransferWareHouseStatus = transitOrderList?.transfer_warehouse_status.ParseToString();
o.PreAllocatedOrderNoStr = transitOrderList?.pre_allocated_order_no.ParseToString();
pdd_order.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
pdd_order.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
pdd_order.ShopOrderSkuNameStr = wx_order_item?.sku_attr_str;
pdd_order.WxOrderCreateTime = wx_order_item?.ItemOrder?.create_time == null ? DateTime.MinValue : BaseClass.StampToDateTime((wx_order_item?.ItemOrder?.create_time).ParseToInt());
pdd_order.ShopOrderRefundStr = ""; // (/*refund_item?.count > 0 &&*/ wx_order_item.refund_status > 1) ? "店铺售后" : "";
pdd_order.wxRefundStatus = "";
if (wx_order_item.refund_status > 1)
{
pdd_order.ShopOrderRefundStr = "店铺售后";
pdd_order.wxRefundStatus = pdd_order.order_status_prompt.Contains("待发货") ? "待退款" : "待退货";
}
pdd_order.TransitWarehouseIdStr = wx_transit_order?.platform;
pdd_order.Express1WaybillStr = wx_transit_order?.express_1_waybill;
pdd_order.Express1CompanyStr = wx_transit_order?.express_1_company;
pdd_order.Express2WaybillStr = wx_transit_order?.express_2_waybill;
pdd_order.Express2CompanyStr = wx_transit_order?.express_2_company;
pdd_order.TransferWareHouseStatus = wx_transit_order?.transfer_warehouse_status.ParseToString();
pdd_order.PreAllocatedOrderNoStr = wx_transit_order?.pre_allocated_order_no.ParseToString();
// 更新订单中转取号状态
o.sendStatus = (o.TransitOrderStatus + " " + o.ShopOrderRefundStr).Trim();
o.TransitCreateTime = transitOrderList?.created_time ?? DateTime.MinValue;
pdd_order.sendStatus = (pdd_order.TransitOrderStatus + " " + pdd_order.ShopOrderRefundStr).Trim();
pdd_order.TransitCreateTime = wx_transit_order?.created_time ?? DateTime.MinValue;
}
void CefReadBuyerOrder(string url, string data)
@@ -588,21 +674,32 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids);
foreach(var order in orders)
{
foreach (var orderItem in order.orderItems)
{
// 中转仓订单
if (orderItem.ItemOrder.orderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
}
}
var refunds = GetOrderRefundInfo(order_ids);
foreach (PddBuyerOrderLiteInfo o in list)
{
o.buyerId = buyer.buyer_id;
o.buyerName = buyer.buyer_name;
o.outExpressCompanyMsg = o.extra_info.order_hint?.message;
// 查找店铺订单并更新店铺订单状态
var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.orderItems.Any(i1 => i1.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn)));
if (ShopOrder != null)
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == o.order_sn);
if (transit_item != null)
{
var order_item = ShopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
var shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == o.order_sn);
UpdateOrderStatus(o, order_item, refund_item, transit_item);
}
@@ -655,7 +752,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order.parent_order_sn = o.parent_order_sn;
order.service_amount = o.service_amount;
order.shipping_amount = o.shipping_amount;
order.outExpressCompanyMsg = o.outExpressCompanyMsg;
order.order_time = o.order_time;
order.tracking_number = o.tracking_number;
order.ShopOrderIdStr = o.ShopOrderIdStr;
@@ -669,6 +765,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order.TransferWareHouseStatus = o.TransferWareHouseStatus;
order.PreAllocatedOrderNoStr = o.PreAllocatedOrderNoStr;
order.ShopOrderRefundStr = o.ShopOrderRefundStr;
order.wxRefundStatus = o.wxRefundStatus;
var index = lstPddBuyerOrderInfoLite.IndexOf(order);
Dispatcher.Invoke(new Action(() =>
@@ -703,6 +800,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
Task.Run(() =>
{
//SendOrderE57(order);
//if (order.sendStatus.ParseToString().Contains("售后"))
if (order.ShopOrderRefundStr.ParseToString().Contains("售后"))
{
if (",2,3,4,5,7,8,10,31,".Contains((order.after_sales?.after_sales_status).ParseToString()))
{
var afterSaleRst = PddAutoAfterSale(order);
}
}
SendTransitOrderE57(order);
});
@@ -800,7 +905,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{
Task.Run(() =>
{
SendAfterSaleE57(lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.orderSn == afterSale.orderSn));
//SendAfterSaleE57(lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.orderSn == afterSale.orderSn));
});
Dispatcher.Invoke(new Action(() =>
@@ -821,30 +926,25 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
TimeSpan PauseTick = new TimeSpan(1);
private void chkAutoReadBuyerOrder_CheckedChanged(object sender, RoutedEventArgs e)
{
IsAutoReadBuyerOrder = chkAutoReadBuyerOrder.IsChecked == true;
if (!IsAutoReadBuyerOrder)
if (isLoad)
{
//if (cancellationTokenSource != null)
// cancellationTokenSource.Cancel();
}
if (IsAutoReadBuyerOrder)
buyerReadOrderConfig.IsAutoReadOrder = chkAutoReadBuyerOrder.IsChecked == true;
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_config", buyerReadOrderConfig);
//buyerOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerOrderConfig>("pdd_buyer_order_config");
if (buyerReadOrderConfig.IsAutoReadOrder)
nextGetOrderTime = DateTime.Now + PauseTick;
else
PauseTick = nextGetOrderTime - DateTime.Now;
if (isLoad)
{
buyerOrderConfig.IsPause = !IsAutoReadBuyerOrder;
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_config", buyerOrderConfig);
//buyerOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerOrderConfig>("pdd_buyer_order_config");
return;
}
}
private void btnSearch_Click(object sender, RoutedEventArgs e)
{
GetOrderAndAfterSale();
}
void GetOrderAndAfterSale()
{
nextGetOrderTime = DateTime.Now.AddMinutes(25);
GetPddOrder();
@@ -1148,15 +1248,30 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids);
//foreach (var order in orders)
//{
// foreach (var orderItem in order.orderItems)
// {
// // 中转仓订单
// if (orderItem.ItemOrder.orderItems.Count > 1)
// orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
// else
// orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
// }
//}
var refunds = GetOrderRefundInfo(order_ids);
// 查找店铺订单并更新店铺订单状态
var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.orderItems.Any(i1 => i1.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn)));
if (ShopOrder != null)
//var ShopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.orderItems.Any(i1 => i1.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn)));
//var ShopOrder = orders.FirstOrDefault(o1 => o1.orderItems.Any(i1 => i1.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn)));
//if (ShopOrder != null)
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == buyerOrder.order_sn);
if (transit_item != null)
{
var order_item = ShopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no);
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == buyerOrder.order_sn);
UpdateOrderStatus(buyerOrder, order_item, refund_item, transit_item);
}
@@ -1180,81 +1295,82 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// order.sendStatus = "";
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
// 处理中, "已取号(更正)", 已取号, 提前取号, 取号失败
// 仓库处理中
if (order.sendStatus.ParseToString().Contains("仓库处理中"))
{
// 仓库处理中超过10分钟认为已处理完成,否则跳过。
if (order.TransitCreateTime.AddMinutes(10) < DateTime.Now)
{
order.sendStatus = order.sendStatus.Replace("仓库处理中", "").Trim();
}
else
{
return;
}
}
// "已取号(更正)", 已取号, 提前取号, 取号失败
// 正在处理取号、已取号(包括提前取号更正的订单)、有售后或者没有中转仓(非中转系统订单)的订单,不发送
if (order.sendStatus == "处理中" || order.sendStatus == "已取号" || order.sendStatus == "已取号(更正)" ||
if (order.sendStatus == "已取号" || order.sendStatus == "已取号(更正)" ||
order.sendStatus.ParseToString().Contains("售后") || order.TransitWarehouseIdStr.IsNullOrEmpty())
{
return;
}
// 物流单号不为空才更新服务端
if (order.outExpressCompanyCode.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
// 物流单号为空,先判断是否需要提前取号,无需提前取号则直接返回
if (order.outExpressCompanyCode.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
{
// 如果是隔天订单,拍单20分钟后立即提前取号
if (!order.sendStatus.Contains("提前取号") && order.TransitCreateTime != DateTime.MinValue &&
DateTime.Now.Date > order.WxOrderCreateTime.Date && DateTime.Now > order.TransitCreateTime.AddMinutes(20))
{
JObject data = new JObject();
data["outOrderNo"] = order.order_sn;
data["warehouseCode"] = order.TransitWarehouseIdStr; //transit.TransId; // 中转仓仓库对应编码
data["platform"] = "WEISHOP";
var getVirtualTicketUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/order/virtual/create";
var getVirtualTicketDataStr = JsonHelper.SerializeObject(data);
var getVirtualTicketRst = HttpResponseWXBLL.e57PostResponse(getVirtualTicketUrl, getVirtualTicketDataStr, "");
if (!getVirtualTicketRst.ParseToString().Contains("<code>200</code>") && !getVirtualTicketRst.ParseToString().Contains("<code>0</code>"))
{
string msg = "";
string code = "";
try
{
System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
xmlDoc.LoadXml(getVirtualTicketRst);
code = xmlDoc["AjaxResult"]["code"].InnerText;
msg = xmlDoc["AjaxResult"]["msg"].InnerText;
}
catch
{
msg = getVirtualTicketRst.ParseToString();
}
//BaseMsgForm.ShowError("拍单信息保存成功,接收到erp服务端传递的错误消息:" + msg, "订单提前取号失败");
order.sendStatus = "提前取号失败,服务端返回 " + msg;
}
}
return;
}
// 如果物流不一致,提交物流信息
if (order.Express1CompanyStr != order.outExpressCompanyCode || order.Express1WaybillStr != order.tracking_number)
{
//JObject obj = new JObject();
//obj["orderNo"] = order.ShopOrderIdStr;
//obj["orderSkuId"] = order.ShopOrderSkuIdStr;
//obj["outOrderNo"] = order.order_sn;
//obj["outAmount"] = order.order_amount.ParseToString();
//obj["buyerAccount"] = order.buyerName;
//obj["purchaserNote"] = BaseClass.NickName;
//obj["platform"] = order.TransitWarehouseIdStr; // 中转仓ID
//obj["orderPlatformCode"] = "WEISHOP";
//if (!order.outExpressCompanyCode.IsNullOrEmpty() && !order.tracking_number.IsNullOrEmpty())
//{
// obj["express1Company"] = order.outExpressCompanyCode; // 物流公司编号
// obj["express1Waybill"] = order.tracking_number; // 物流单号
//}
//var dataStr = JsonHelper.SerializeObject(obj);
//string url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
////<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult>
//var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
//if (!exportRst.Contains("<code>200</code>"))
//{
// order.sendStatus = "提交运单信息失败";
// return;
//}
//if (order.outExpressCompanyCode.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
//{
// order.sendStatus = "已提交";
//}
//var url3 = BaseClass.Build29WxObjString("order/wx_update_erp_order_express");
//var data3 = UserLogin.GetSignaturex();
//data3 += "&out_order_no=" + order.order_sn;
//data3 += "&express_1_company=" + order.outExpressCompanyCode; // 物流公司编号
//data3 += "&express_1_waybil=" + order.tracking_number; // 物流单号
//var html3 = GetHtml.PostUtf8(url3, data3);
//if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
// html3 = GetHtml.PostUtf8(url3, data3);
//if (html3.Contains("\"code\":200"))
//{
// order.sendStatus = "已提交";
//}
// 修改上游物流单号
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
JObject obj = new JObject();
obj["platform"] = "WEISHOP";
obj["outOrderNo"] = order.order_sn; //外采单号
obj["outExpressCompany"] = order.outExpressCompanyCode; // 物流公司编号
obj["outExpressNo"] = order.tracking_number; // 物流单号
obj["orderCode"] = order.tracking_number; //实际就是外采单号
var dataStr = JsonHelper.SerializeObject(obj);
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
if (exportRst.Contains("<code>0</code>") || exportRst.Contains("<code>200</code>"))
{
order.sendStatus = "提交物流信息失败";
return;
}
}
//// 如果物流不一致,提交物流信息 临时补救
//if (order.Express1CompanyStr != order.outExpressCompanyCode || order.Express1WaybillStr != order.tracking_number)
//{
// //var url3 = BaseClass.Build29WxObjString("order/wx_update_erp_order_express");
// //var data3 = UserLogin.GetSignaturex();
// //data3 += "&out_order_no=" + order.order_sn;
// //data3 += "&express_1_company=" + order.outExpressCompanyCode; // 物流公司编号
// //data3 += "&express_1_waybil=" + order.tracking_number; // 物流单号
// //var html3 = GetHtml.PostUtf8(url3, data3);
// //if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
// // html3 = GetHtml.PostUtf8(url3, data3);
// //if (html3.Contains("\"code\":200"))
// //{
// // order.sendStatus = "已提交";
// //}
//}
// 直接取号
if (order.sendStatus != "提前取号" && order.sendStatus != "提前取号(旧订单)")
{
@@ -1294,7 +1410,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
else
{
order.sendStatus = "直接取号失败" + BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "直接取号失败,服务端返回 " + BaseRegex.GetStringXml(ref dispatchRst, "msg");
}
}
// 修改提前取号
@@ -1303,6 +1419,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
{
order.sendStatus = "提前取号流程进行中";
return;
}
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
@@ -1313,7 +1430,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
data["outExpressCompany"] = order.outExpressCompanyCode; // 物流公司编号
data["outExpressNo"] = order.tracking_number;
data["platform"] = "WEISHOP";
data["orderCode"] = order.order_sn; // 中转仓订单唯一标识码 = 外采定单号
data["orderCode"] = order.order_sn; // 中转仓订单唯一标识码 = 外采订单号
var dataStr2 = JsonHelper.SerializeObject(data);
var dispatchRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
@@ -1346,7 +1463,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
else
{
order.sendStatus = "修改提前取号失败" + BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "修改提前取号失败,服务端返回 " + BaseRegex.GetStringXml(ref dispatchRst, "msg");
}
}
}
@@ -1525,7 +1642,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
while (isReadBuyerOrder)
{
Thread.Sleep(500);
//break;
}
foreach (var buyer in GlobalConfig.PDDBuyerLoginList)
@@ -1533,7 +1649,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
//postman request POST 'https://po.e57.cn/prod-api/api/oms-api/external_procurement/hasAfterSsale' \
//--header 'Content-Type: application/json' \
//--body '{ "platform": "WEISHOP", "startTime": 1774763836, "endTime": "1776050614" , "userAccount": "闲鱼会开车的鱼2343"}'
JObject body = new JObject();
body["platform"] = "WEISHOP";
body["startTime"] = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddDays(-7));
@@ -1561,14 +1676,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order.wxRefundStatus = order.order_status_prompt.Contains("待发货") ? "待退款" : "待退货";
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
Dispatcher.Invoke(new Action(() =>
{
ShowOrder(order);
}));
if (chkAutoAfterSale.IsChecked == true)
{
MakeWxToPddAfterSale(order);
}
//Dispatcher.Invoke(new Action(() =>
//{
// ShowOrder(order);
//}));
//if (chkAutoAfterSale.IsChecked == true)
//{
// PddAutoAfterSale(order);
//}
}
}
catch (Exception ex)
@@ -1584,7 +1699,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// </summary>
/// <param name="order"></param>
/// <returns></returns>
public string MakeWxToPddAfterSale(PddBuyerOrderLiteInfo order)
public string PddAutoAfterSale(PddBuyerOrderLiteInfo order)
{
//if (isReadOrder)
//{
@@ -1625,6 +1740,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var afterSaleRst = YkdBuyerOrder.SetOrderAfterSale(buyer, mobile, order.order_sn, applyAmount, refundAmount, newMaxApplyAmount);
if (afterSaleRst.Contains("\"after_sales_status\":1") || afterSaleRst.Contains("该订单已全额退款"))
{
// 保存退款成功状态
//order.refundStatus = "已完成/退货";
order.order_status_prompt = "退款成功";
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
@@ -1691,6 +1807,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
else
Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1);
}
private void btnHide_Click(object sender, RoutedEventArgs e)
{
if (btnHide.Content.ParseToString() == "▲")
{
btnHide.Content = "▼";
gridTable.Visibility = Visibility.Visible;
}
else
{
btnHide.Content = "▲";
gridTable.Visibility = Visibility.Collapsed;
}
}
private void chkAutoAfterSale_Checked(object sender, RoutedEventArgs e)
{
if (isLoad)
{
buyerReadOrderConfig.IsAutoAfterSale = chkAutoAfterSale.IsChecked == true;
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_config", buyerReadOrderConfig);
}
}
}
public class YkdBuyerOrder
@@ -1730,9 +1869,15 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
}
public class BuyerOrderConfig
public class BuyerReadOrderConfig
{
public bool IsPause = false;
/// <summary>
/// 是否自动读单
/// </summary>
public bool IsAutoReadOrder = true;
/// <summary>
/// 是否自动售后未发货订单
/// </summary>
public bool IsAutoAfterSale = true;
}
}