拼多多买手直接退款 其他订单逻辑优化
This commit is contained in:
1 parent
1669305479
commit
b877695e4b
42 files changed
+1958
-1980
No files matched your search
@@ -174,6 +174,7 @@
|
||||
<Compile Include="Ctrls\OrderCtrls\OrderListCtrl.xaml.cs">
|
||||
<DependentUpon>OrderListCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StartUp.cs" />
|
||||
<Compile Include="ToolCtrls\Icons.xaml.cs">
|
||||
<DependentUpon>Icons.xaml</DependentUpon>
|
||||
</Compile>
|
||||
|
||||
+34
-35
@@ -51,7 +51,7 @@ namespace _29WxOrderWpf
|
||||
//处理非UI线程异常
|
||||
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
|
||||
|
||||
//StartUp.Init();
|
||||
StartUp.Init();
|
||||
new Initialization().Get();
|
||||
|
||||
#region 贴牌
|
||||
@@ -62,46 +62,45 @@ namespace _29WxOrderWpf
|
||||
//string IbPakFile = "locales/ib.pak";//ico
|
||||
string IcPakFile = "locales/ic.pak";//功能配置
|
||||
|
||||
if (!File.Exists("locales/io.pak"))
|
||||
if (File.Exists("locales/io.pak"))
|
||||
{
|
||||
return;
|
||||
}
|
||||
var ioTxt = FileBase.ReadAllText("locales/io.pak");
|
||||
if (ioTxt.StartsWith("MThd") || !ioTxt.Contains("MThd"))
|
||||
return;
|
||||
|
||||
var ioTxt = FileBase.ReadAllText("locales/io.pak");
|
||||
if (ioTxt.StartsWith("MThd") || !ioTxt.Contains("MThd"))
|
||||
return;
|
||||
|
||||
string agentNameFile = "locales/na.pak";
|
||||
if (File.Exists(agentNameFile))
|
||||
{
|
||||
var config = FileBase.ReadAllText(agentNameFile, Encoding.UTF8);
|
||||
var configArr = config.Split(new string[] { "\r\n", "MThd" }, StringSplitOptions.RemoveEmptyEntries);
|
||||
if (configArr.Length >= 2)
|
||||
string agentNameFile = "locales/na.pak";
|
||||
if (File.Exists(agentNameFile))
|
||||
{
|
||||
BaseClass.ProgramName = configArr[1];
|
||||
BaseClass.ToolName = configArr[1];
|
||||
BaseClass.AgentName = configArr[0];
|
||||
var config = FileBase.ReadAllText(agentNameFile, Encoding.UTF8);
|
||||
var configArr = config.Split(new string[] { "\r\n", "MThd" }, StringSplitOptions.RemoveEmptyEntries);
|
||||
if (configArr.Length >= 2)
|
||||
{
|
||||
BaseClass.ProgramName = configArr[1];
|
||||
BaseClass.ToolName = configArr[1];
|
||||
BaseClass.AgentName = configArr[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
string LogoPakFile = "locales/lo.pak"; // ico
|
||||
if (File.Exists(LogoPakFile))
|
||||
{
|
||||
BitmapImage bitmap = new BitmapImage(new Uri(LogoPakFile, UriKind.Relative));
|
||||
Application.Current.Resources["main29WeixinIcon"] = bitmap;
|
||||
// winform部分,直接指定路径,从bitmap转换的会丢失颜色
|
||||
BaseClass.Ico = new Icon(LogoPakFile); //BitmapImageToIcon(Application.Current.Resources["main29WeixinIcon"] as BitmapImage);
|
||||
}
|
||||
//BaseClass.ProgromLogo = Environment.CurrentDirectory + "\\locales\\ia.pak";//logo
|
||||
//BaseClass.ProgromLogoIco = Environment.CurrentDirectory + "\\locales\\ib.pak";//ico
|
||||
string ImgPakFile = "locales/im.pak";
|
||||
if (File.Exists(ImgPakFile))
|
||||
{
|
||||
BaseClass.LogoImage = Image.FromFile(ImgPakFile);
|
||||
}
|
||||
string LogoPakFile = "locales/lo.pak"; // ico
|
||||
if (File.Exists(LogoPakFile))
|
||||
{
|
||||
BitmapImage bitmap = new BitmapImage(new Uri(LogoPakFile, UriKind.Relative));
|
||||
Application.Current.Resources["main29WeixinIcon"] = bitmap;
|
||||
// winform部分,直接指定路径,从bitmap转换的会丢失颜色
|
||||
BaseClass.Ico = new Icon(LogoPakFile); //BitmapImageToIcon(Application.Current.Resources["main29WeixinIcon"] as BitmapImage);
|
||||
}
|
||||
//BaseClass.ProgromLogo = Environment.CurrentDirectory + "\\locales\\ia.pak";//logo
|
||||
//BaseClass.ProgromLogoIco = Environment.CurrentDirectory + "\\locales\\ib.pak";//ico
|
||||
string ImgPakFile = "locales/im.pak";
|
||||
if (File.Exists(ImgPakFile))
|
||||
{
|
||||
BaseClass.LogoImage = Image.FromFile(ImgPakFile);
|
||||
}
|
||||
|
||||
// 待后续完善
|
||||
OenMechanism(IgPakFile, OenVersionFile, IaPakFile, LogoPakFile, IcPakFile);
|
||||
// 待后续完善
|
||||
OenMechanism(IgPakFile, OenVersionFile, IaPakFile, LogoPakFile, IcPakFile);
|
||||
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -14,6 +14,8 @@ namespace _29WxOrderWpf.Converters
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
if ( value == null)
|
||||
return Visibility.Collapsed;
|
||||
return !value.ParseToString().Trim().IsNullOrEmpty() ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -38,7 +38,7 @@
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox x:Name="txtOrderId" WaterMark="" DataContext="{Binding ElementName=txtOrderId,Path=DataContext}" Grid.Column="1" Margin="0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" Grid.ColumnSpan="1" />
|
||||
<TextBlock Text="店铺单号" Grid.Column="1" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}" Grid.ColumnSpan="1"></TextBlock>
|
||||
@@ -48,22 +48,25 @@
|
||||
<TextBlock Text="全部店铺" Grid.Column="2" Margin="12,0,24,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
|
||||
Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<Button Grid.Column="2" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" HorizontalAlignment="Right" Margin="0" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"/>
|
||||
|
||||
|
||||
<TextBox x:Name="txtGoodsName" Grid.Column="4" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
|
||||
<TextBlock Text="商品标题" Grid.Column="4" Margin="12,0,0,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
|
||||
<ComboBox Grid.Column="5" x:Name="cmbUserNameMobile" Margin="12,0,4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Width="70" Height="28" Text="成交时间"/>
|
||||
<Border Grid.Column="5" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
|
||||
<Border Grid.Column="6" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0"/>
|
||||
<DatePicker x:Name="dateStart" Grid.Column="6" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
<Border Grid.Column="6" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0" Margin="0,0,10,0"/>
|
||||
<DatePicker x:Name="dateStart" Grid.Column="6" Margin="0,0,14,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
|
||||
<Border Grid.Column="7" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0"/>
|
||||
<DatePicker x:Name="dateEnd" Grid.Column="7" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
<Border Grid.Column="7" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0" Margin="-10,0,0,0"/>
|
||||
<DatePicker x:Name="dateEnd" Grid.Column="7" Margin="10,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
<CheckBox Grid.Column="7" x:Name="chkEndDate" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-6,0"/>
|
||||
|
||||
<Button Grid.Column="8" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="过滤" Width="48" Height="24" Click="btnFilter_Click"/>
|
||||
<Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" Width="48" Height="24" Click="btnSearch_Click" IsEnabled="False"/>
|
||||
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0" IsEnabled="False">
|
||||
<Button Grid.Column="8" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="过滤" MinWidth="48" Height="28" Click="btnFilter_Click" Padding="4"/>
|
||||
<Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" MinWidth="48" Height="28" Click="btnSearch_Click" Padding="4" IsEnabled="False"/>
|
||||
|
||||
<WrapPanel Grid.Column="10" VerticalAlignment="Center">
|
||||
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0" IsEnabled="False">
|
||||
<Image.RenderTransform>
|
||||
<RotateTransform Angle="45" CenterX="10" CenterY="10"/>
|
||||
</Image.RenderTransform>
|
||||
@@ -83,9 +86,16 @@
|
||||
</EventTrigger>
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
<CheckBox Content="自动读单" x:Name="chkAutoReadOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="2,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="true"/>
|
||||
</WrapPanel>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="gridListHeader" Margin="8,2,8,0" Grid.Row="1">
|
||||
<TextBox x:Name="txtAdminSearch" Grid.Column="4" Margin="8,0,56,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" VerticalAlignment="Top" HorizontalAlignment="Right" Width="260" Visibility="Collapsed"/>
|
||||
<Button Grid.Column="8" x:Name="btnAdminSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,2,0,0" Content="超管查询" Width="52" Height="24" Click="btnFilter_Click"
|
||||
VerticalAlignment="Top" HorizontalAlignment="Right" Visibility="Collapsed"/>
|
||||
<TabControl x:Name="tabOrderType" VerticalAlignment="Stretch" FontSize="16" SelectionChanged="tabOrderType_SelectionChanged" >
|
||||
<TabControl.Resources>
|
||||
<Style TargetType="{x:Type TabControl}">
|
||||
@@ -149,9 +159,9 @@
|
||||
</Border>
|
||||
</TabItem >
|
||||
<TabItem Header="待发货"></TabItem>
|
||||
<TabItem Header="待收货" BorderBrush="Transparent" Background="Transparent"> </TabItem>
|
||||
<TabItem Header="退款单" Foreground="#FF6666" BorderBrush="Transparent" Background="Transparent"> </TabItem>
|
||||
<TabItem Header="全部订单" BorderBrush="Transparent" Background="Transparent"> </TabItem>
|
||||
<TabItem Header="待收货" BorderBrush="Transparent" Background="Transparent"></TabItem>
|
||||
<TabItem Header="退款单" Foreground="#FF6666" BorderBrush="Transparent" Background="Transparent"></TabItem>
|
||||
<TabItem Header="全部订单" BorderBrush="Transparent" Background="Transparent"></TabItem>
|
||||
<!--<TabItem Header="发货异常">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>-->
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||
using _29WxOrderWpf.Utils;
|
||||
using AllBase;
|
||||
using AllBase.Extension;
|
||||
@@ -24,6 +25,7 @@ using System.Windows.Media.Imaging;
|
||||
using System.Windows.Shapes;
|
||||
using TemuKJD.ToolForms;
|
||||
using Work;
|
||||
using Work._29Tools.BLL;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
@@ -32,9 +34,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
/// </summary>
|
||||
public partial class OrderListCtrl : UserControl
|
||||
{
|
||||
|
||||
public CheckBox chkSelectAll = null;
|
||||
|
||||
public bool IsAutoReadOrder = true;
|
||||
public DateTime nextGetOrderTime = DateTime.MinValue;
|
||||
|
||||
public OrderListCtrl()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -49,19 +53,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
dateStart.SelectedDate = DateTime.Now.Date.AddDays(-7);
|
||||
dateEnd.SelectedDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
while (!MainWindow.Instance.hasReadShop)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
|
||||
GetOrder();
|
||||
//GetOrderTest();
|
||||
});
|
||||
AutoGetOrder();
|
||||
}
|
||||
|
||||
void GetOrderTest()
|
||||
public void GetOrderTest()
|
||||
{
|
||||
for (int i = 0; i < 10000; i++)
|
||||
{
|
||||
@@ -71,245 +66,284 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
GlobalConfig.lstOrder.SortDesc(o => o.order_id.ParseToLong());
|
||||
}
|
||||
|
||||
public void AutoGetOrder()
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
Thread.Sleep(5000);
|
||||
while (true)
|
||||
{
|
||||
if (!IsAutoReadOrder)
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
btnSearch.Content = "自动读单暂停中";
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
}));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (DateTime.Now > nextGetOrderTime)
|
||||
{
|
||||
GetOrder();
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(25);
|
||||
}
|
||||
Thread.Sleep(1000);
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
var ticks = nextGetOrderTime - DateTime.Now;
|
||||
btnSearch.Content = "读单 " + ticks.Minutes.ToString("00") + ":" + ticks.Seconds.ToString("00");
|
||||
}));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public bool hasReadOrder = false;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="filterGetCondition">按过滤条件读取读取服务端订单</param>
|
||||
void GetOrder(bool filterGetCondition = false)
|
||||
public void GetOrder(string orderIds = "", bool filterGetCondition = false)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
imgLoading.Visibility = Visibility.Visible;
|
||||
btnSearch.IsEnabled = false;
|
||||
}));
|
||||
Task.Run(() =>
|
||||
int page = 0;
|
||||
int totalPage = 1;
|
||||
int pageSize = 50;
|
||||
|
||||
while (true && IsAutoReadOrder)
|
||||
{
|
||||
int page = 0;
|
||||
int totalPage = 1;
|
||||
int pageSize = 50;
|
||||
|
||||
while (true)
|
||||
if (page >= totalPage)
|
||||
{
|
||||
if (page >= totalPage)
|
||||
{
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
page++;
|
||||
var url = BaseClass.Build29WxObjString("order/get_order_list");
|
||||
var data = UserLogin.GetSignaturex() + "&page=" + page;
|
||||
if (page > 1)
|
||||
data += "&is_not_count=true";
|
||||
data += "&page_size=" + pageSize;
|
||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
page++;
|
||||
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
||||
var data = UserLogin.GetSignaturex() + "&page=" + page;
|
||||
if (!string.IsNullOrEmpty(orderIds))
|
||||
data += "&erp_order_id_in=" + orderIds;
|
||||
if (page > 1)
|
||||
data += "&is_not_count=true";
|
||||
data += "&page_size=" + pageSize;
|
||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
// 按过滤条件读取
|
||||
if (filterGetCondition)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(txtShopName.Text.Trim()))
|
||||
{
|
||||
var shopNames = txtShopName.Text.Trim().Split(';').Where(s => !s.IsNullOrEmpty()).ToList();
|
||||
shop_id = string.Join(",", GlobalConfig.ShopLoginList.Where(s => shopNames.Contains(s.ShopAccount)).Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
}
|
||||
}
|
||||
var startTime = BaseClass.DateTimeToTimestampSeconds(dateStart.SelectedDate.Value);
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(dateEnd.SelectedDate.Value.AddDays(1));
|
||||
if (!chkEndDate.IsChecked.ParseToBool())
|
||||
endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(1));
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
data += "&start_time=" + startTime;
|
||||
data += "&end_time=" + endTime;
|
||||
}));
|
||||
Thread.Sleep(200);
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
|
||||
var jArr = JObject.Parse(html)["data"];
|
||||
if (jArr.Count() == 0)
|
||||
break;
|
||||
|
||||
var order_ids = string.Join(",", jArr.Select(a => a["order_id"].ParseToString()));
|
||||
|
||||
// 读取订单详情
|
||||
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()); } catch { }
|
||||
|
||||
|
||||
// 读取售后单
|
||||
Thread.Sleep(100);
|
||||
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);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
html2 = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
|
||||
try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
|
||||
|
||||
|
||||
// 读取中转仓拍单订单
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&order_no=" + order_ids;
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
// 按过滤条件读取
|
||||
if (filterGetCondition)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(txtShopName.Text.Trim()))
|
||||
{
|
||||
var shopNames = txtShopName.Text.Trim().Split(';').Where(s => !s.IsNullOrEmpty()).ToList();
|
||||
shop_id = string.Join(",", GlobalConfig.ShopLoginList.Where(s => shopNames.Contains(s.ShopAccount)).Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
}
|
||||
}
|
||||
var startTime = BaseClass.DateTimeToTimestampSeconds(dateStart.SelectedDate.Value);
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(dateEnd.SelectedDate.Value.AddDays(1));
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
data += "&start_time=" + startTime;
|
||||
data += "&end_time=" + endTime;
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
}));
|
||||
Thread.Sleep(200);
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
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());
|
||||
transitOrderList = transitOrderList.Where(t => t.transfer_refund_status.IsNullOrZero()).ToList();
|
||||
}
|
||||
catch { }
|
||||
|
||||
|
||||
// 读取关联拍单商品
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => oi.out_product_id)) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
}));
|
||||
break;
|
||||
}
|
||||
List<WXBuyMapInfo> byuMapList = new List<WXBuyMapInfo>();
|
||||
try { byuMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString()); } catch { }
|
||||
|
||||
var jArr = JObject.Parse(html)["data"];
|
||||
if (jArr.Count() == 0)
|
||||
break;
|
||||
|
||||
var order_ids = string.Join(",", jArr.Select(a => a["order_id"].ParseToString()));
|
||||
|
||||
// 读取订单详情
|
||||
Thread.Sleep(100);
|
||||
var url1 = BaseClass.Build29WxObjString("order/get_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(url, data);
|
||||
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
||||
// 装载订单
|
||||
foreach (JObject jObj in jArr)
|
||||
{
|
||||
try
|
||||
{
|
||||
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()); } catch { }
|
||||
|
||||
oms_wei_order_info order = null;
|
||||
|
||||
// 读取售后单
|
||||
Thread.Sleep(100);
|
||||
var url2 = BaseClass.Build29WxObjString("order/get_refund_list");
|
||||
var data2 = UserLogin.GetSignaturex();
|
||||
data2 += "&erp_order_id_in=" + order_ids;
|
||||
var html2 = GetHtml.PostUtf8(url2, data2);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
html2 = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
|
||||
try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
|
||||
|
||||
|
||||
// 读取中转仓拍单订单
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&order_no=" + order_ids;
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
if (order.order_id == "3737398647233862400")
|
||||
{
|
||||
|
||||
}
|
||||
}));
|
||||
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 { }
|
||||
|
||||
|
||||
// 读取关联拍单商品
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => oi.out_product_id)) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
//装载订单商品详情
|
||||
order.orderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
}));
|
||||
break;
|
||||
}
|
||||
List<WXBuyMapInfo> byuMapList = new List<WXBuyMapInfo>();
|
||||
try { byuMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString()); } catch { }
|
||||
// 订单商品
|
||||
item.ItemOrder = order;
|
||||
order.orderItems.Add(item);
|
||||
|
||||
item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == item.order_id);
|
||||
Dispatcher.Invoke(new Action(() => { item.UpdateOrderItemBuyButton(); }));
|
||||
|
||||
// 装载订单
|
||||
foreach (JObject jObj in jArr)
|
||||
{
|
||||
try
|
||||
{
|
||||
oms_wei_order_info order = null;
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
// 关联拍单关系 // 危险物品禁止拍单,仅关联安全商品
|
||||
if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
||||
{
|
||||
order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
if (order.order_id == "3737398647233862400")
|
||||
{
|
||||
|
||||
}
|
||||
}));
|
||||
//装载订单商品详情
|
||||
order.orderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
// 订单商品
|
||||
item.ItemOrder = order;
|
||||
order.orderItems.Add(item);
|
||||
|
||||
item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == item.order_id);
|
||||
Dispatcher.Invoke(new Action(() => { item.UpdateOrderItemBuyButton(); }));
|
||||
|
||||
// 关联拍单关系 // 危险物品禁止拍单,仅关联安全商品
|
||||
if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
||||
{
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
}
|
||||
|
||||
// 中转仓订单
|
||||
if (item.ItemOrder.orderItems.Count > 1)
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
else
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||
}
|
||||
//装载订单售后详情
|
||||
order.refundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.SetItemRefund(order.refundItems.ToList());
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
}
|
||||
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
GlobalConfig.lstOrder.Remove(orderExist);
|
||||
|
||||
var nextOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Insert(GlobalConfig.lstOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
// 中转仓订单
|
||||
if (item.ItemOrder.orderItems.Count > 1)
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
}
|
||||
if (order.orderItems.Count > 1)
|
||||
{
|
||||
}
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
FilterOneOrder(order);
|
||||
}));
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||
}
|
||||
catch (Exception ex)
|
||||
//装载订单售后详情
|
||||
order.refundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.SetItemRefund(order.refundItems.ToList());
|
||||
}
|
||||
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
GlobalConfig.lstOrder.Remove(orderExist);
|
||||
|
||||
var nextOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Insert(GlobalConfig.lstOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
}
|
||||
if (order.orderItems.Count > 1)
|
||||
{
|
||||
}
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
FilterOneOrder(order);
|
||||
}));
|
||||
}
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
catch (Exception ex)
|
||||
{
|
||||
disPlayOrderTabCount();
|
||||
}));
|
||||
|
||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||
if (totalCount > 0)
|
||||
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
hasReadOrder = true;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
imgLoading.Visibility = Visibility.Hidden;
|
||||
btnSearch.IsEnabled = true;
|
||||
disPlayOrderTabCount();
|
||||
}));
|
||||
});
|
||||
|
||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||
if (totalCount > 0)
|
||||
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
hasReadOrder = true;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
btnSearch.IsEnabled = true;
|
||||
}));
|
||||
}
|
||||
|
||||
void disPlayOrderTabCount()
|
||||
@@ -418,6 +452,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (order.createDateTime < dateStart.SelectedDate.Value)
|
||||
return true;
|
||||
if (chkEndDate.IsChecked == true && order.createDateTime > dateEnd.SelectedDate.Value)
|
||||
return true;
|
||||
if (headerStr.StartsWith("待采购"))
|
||||
{
|
||||
if (!order.IsWaitBuy)
|
||||
@@ -466,7 +504,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private void btnSearch_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
GetOrder();
|
||||
this.btnSearch.IsEnabled = false;
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
Thread.Sleep(5000);
|
||||
Dispatcher.Invoke(new Action(() => { this.btnSearch.IsEnabled = true; }));
|
||||
});
|
||||
Task.Run(() =>
|
||||
{
|
||||
while (!MainWindow.Instance.hasReadShop)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
|
||||
GetOrder();
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(25);
|
||||
});
|
||||
}
|
||||
|
||||
private void btnFilter_Click(object sender, RoutedEventArgs e)
|
||||
@@ -557,5 +611,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
chkMapProdOnly.IsChecked = false;
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
public static string addNotes(ShopLoginInfo shop, string orderId, string notes, int tagColor = -1)
|
||||
{
|
||||
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/common/cgi/batchMerchantNotes?token=&lang=zh_CN";
|
||||
string body = @"{""items"":[{""orderId"":""" + orderId + @""",""merchantNotes"":""" + notes + @""",""merchantNotesTagColor"":" + tagColor + @"}]}";
|
||||
if (tagColor == -1)
|
||||
body = @"{""items"":[{""orderId"":""" + orderId + @""",""merchantNotes"":""" + notes + @"""}]}";
|
||||
|
||||
string refere = "https://store.weixin.qq.com/shop/order/list";
|
||||
var result = HttpResponseWXBLL.WeiXinPostResponse(shop, url, body, refere);
|
||||
return result;
|
||||
}
|
||||
|
||||
private void chkAutoReadBuyerOrder_CheckedChanged(object sender, RoutedEventArgs e)
|
||||
{
|
||||
IsAutoReadOrder = chkAutoReadOrder.IsChecked == true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,10 +21,10 @@
|
||||
<ColumnDefinition Width="auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox Grid.Column="0" Margin="8,8,-4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="店铺单号:" BorderThickness="0" />
|
||||
<uc:UcWaterMarkTextBox Foreground="#409eff" Cursor="Hand" WaterMark="订单号" x:Name="txtOrderId" Grid.Column="1" Margin="0,8,4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding order_id}" BorderThickness="0" />
|
||||
<uc:UcWaterMarkTextBox Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="订单号" x:Name="txtOrderId" Grid.Column="1" Margin="0,8,4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding order_id}" BorderThickness="0" />
|
||||
<Border Grid.Column="2" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand"
|
||||
Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
|
||||
<Path Margin="0,0,0,0" Fill="#409eff" Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>
|
||||
|
||||
<!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
|
||||
@@ -62,13 +62,13 @@
|
||||
VerticalAlignment="Center" FontSize="7" Background="{StaticResource ListHeadBackColorBrush}" IsReadOnly="True"
|
||||
Text="{Binding order_item1.Shop.LoginStatusStr}" BorderThickness="0"
|
||||
Foreground="{Binding order_item1.Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"/>
|
||||
<uc:UcWaterMarkTextBox Foreground="#409eff" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Grid.Column="5" Margin="4,8,4,8" VerticalAlignment="Center"
|
||||
<uc:UcWaterMarkTextBox Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Grid.Column="5" Margin="4,8,4,8" VerticalAlignment="Center"
|
||||
FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding shop_name}" BorderThickness="0" />
|
||||
|
||||
|
||||
<Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand"
|
||||
Tag="{Binding order_id}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown">
|
||||
<Path Margin="0,0,0,0" Fill="#409eff" Tag="{Binding order_id}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" Tag="{Binding order_id}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>
|
||||
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
<uc:UcWaterMarkTextBox WaterMark="运费" Text="{Binding freight_str}" Grid.Column="1" Grid.Row="4" Margin="36,0,4,0" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding freight_visibility}"/>
|
||||
<TextBox Text="平台服务费:" Grid.Column="1" Grid.Row="5" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="平台服务费" Text="{Binding predict_commission_fee_string}" Grid.Row="5" Margin="72,0,4,0" VerticalAlignment="Center"
|
||||
<uc:UcWaterMarkTextBox WaterMark="平台服务费" Text="{Binding predict_commission_fee_str}" Grid.Row="5" Margin="72,0,4,0" VerticalAlignment="Center"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<TextBox Text="达人佣金:" Grid.Column="1" Grid.Row="6" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="达人佣金" Text="{Binding commission_amount_str}" Grid.Row="6" Margin="60,0,4,0" VerticalAlignment="Center"
|
||||
@@ -181,19 +181,19 @@
|
||||
<TextBox Text="收货地址:" Grid.Column="1" Grid.Row="5" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="收货地址" Text="{Binding ItemOrder.address_str}" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="10" x:Name="btnSeeAddressDetail" Background="Transparent" Foreground="#409eff" BorderBrush="Transparent"
|
||||
<Button Grid.Column="10" x:Name="btnSeeAddressDetail" Background="Transparent" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="👁" Click="btnSeeAddressDetail_Click" Tag="{Binding order_id}"></Button>
|
||||
</WrapPanel>
|
||||
<!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
<!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="仓库退货地址:点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>-->
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Width="auto" HorizontalAlignment="Center">
|
||||
<TextBlock Text="退款单号:" VerticalAlignment="Center" Visibility="{Binding ElementName=txtRefundId,Path=Visibility}"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="退款单号" Text="{Binding ItemRefund.after_sale_order_id}" Grid.Column="1" Grid.Row="6" Margin="0,2,4,2" VerticalAlignment="Center"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="#409eff" Cursor="Hand" x:Name="txtRefundId"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" x:Name="txtRefundId"
|
||||
Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}" HorizontalAlignment="Center"/>
|
||||
<Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand"
|
||||
MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown" Visibility="{Binding ElementName=txtRefundId,Path=Visibility}">
|
||||
<Path Margin="0,0,0,0" Fill="#409eff" MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
</Grid>
|
||||
@@ -209,20 +209,36 @@
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<WrapPanel Grid.Row="1" HorizontalAlignment="Center">
|
||||
<Border x:Name="borderBuyStatas" Grid.Row="1" Margin="8,0,0,0" Background="{Binding TransitWaybillStatusBackColor}" BorderBrush="{Binding TransitWaybillStatusBorderColor}"
|
||||
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox x:Name="txtBuyStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding TransitWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center"
|
||||
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitWaybillStatusStr}" BorderThickness="0" />
|
||||
</Border>
|
||||
|
||||
<!--<Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="8,0,0,0" Background="{Binding TransitWaybillStatusBackColor}" BorderBrush="{Binding TransitWaybillStatusBorderColor}"
|
||||
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox x:Name="txtWarehouseStatus" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding TransitWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center"
|
||||
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitWaybillStatusStr}" BorderThickness="0" />
|
||||
</Border>-->
|
||||
</WrapPanel>
|
||||
|
||||
<!--<TextBox Text="发货:" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="发货" Text="" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>-->
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
|
||||
<TextBlock Text="采购账户:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtOutOrderBuyerStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购账户:" Text="{Binding ItemTransitOrder.OutOrderBuyerStr}" Grid.Column="1" Grid.Row="1"
|
||||
Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtOutOrderBuyerStr" Background="Transparent"
|
||||
IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
|
||||
<TextBlock Text="采购单号:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtOutOrderNumStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购单号:" Text="{Binding ItemTransitOrder.OutOrderNumStr}" Grid.Column="1" Grid.Row="1"
|
||||
@@ -230,10 +246,10 @@
|
||||
IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
|
||||
<Border Grid.Column="2" Margin="4,0,0,0" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Visibility="{Binding ElementName=txtOutOrderBuyerStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
|
||||
Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
|
||||
<Path Margin="0,0,0,0" Fill="#409eff" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
|
||||
<TextBlock Text="采购时间:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="采购时间:" Text="{Binding OutOrderTimeQualifiedStr}" Grid.Column="1" Grid.Row="1"
|
||||
@@ -241,10 +257,30 @@
|
||||
IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{Binding OutOrderTimeQualifiedBrush}"/>
|
||||
<!--<Border Grid.Column="2" Margin="4,0,0,0" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
|
||||
Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
|
||||
<Path Margin="0,0,0,0" Fill="#409eff" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
|
||||
</Border>-->
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5" Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBlock Text="取号物流:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding TransitOrderWaybillToWareHouseStr,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="取号物流" Text="{Binding TransitOrderWaybillToWareHouseStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{StaticResource PageOkBrush}"/>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Visibility="{Binding TransitOrderWaybillFakeStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBlock Text="提前物流:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding TransitOrderWaybillFakeStr,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="提前物流" Text="{Binding TransitOrderWaybillFakeStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{StaticResource PageWarningBrush}"/>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBlock Text="仓库物流:" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
|
||||
Visibility="{Binding TransitOrderWaybillFromWareHouseStr,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<uc:UcWaterMarkTextBox WaterMark="仓库物流" Text="{Binding TransitOrderWaybillFromWareHouseStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
</WrapPanel>
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="8" Visibility="{Binding ItemOrder.out_express_no, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="外采:" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="外采" Text="{Binding ItemOrder.out_express_company}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
@@ -253,20 +289,20 @@
|
||||
<uc:UcWaterMarkTextBox WaterMark="外采" Text="{Binding ItemOrder.out_express_no}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5">
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="9" Visibility="{Binding ReturnWaybillId, Converter={StaticResource HasTextVisibility}}">
|
||||
<TextBox Text="退货:" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding ItemRefund.return_delivery_name}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="-" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding ItemRefund.return_waybill_id}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top"
|
||||
<uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding ReturnWaybillId}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
</WrapPanel>
|
||||
<!--
|
||||
<TextBox Text="店铺备注:" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnCopyRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnCopyRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>-->
|
||||
</Grid>
|
||||
<!--备注-->
|
||||
@@ -285,17 +321,28 @@
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
|
||||
<TextBox Text="买家留言:" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="买家留言" Text="" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<TextBox Text="买家留言:" Grid.Column="1" Grid.Row="1" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" BorderBrush="Transparent" IsReadOnly="True" BorderThickness="1"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="买家留言" Text="" Grid.Column="1" Grid.Row="1" Margin="0,1,0,1" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
|
||||
</WrapPanel>
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
|
||||
<TextBox Text="店铺备注:" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnCopyRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>
|
||||
<TextBox Text="店铺备注:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<uc:UcWaterMarkTextBox x:Name="txtShopRemark" WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
|
||||
VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnEditShopRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="2,0,0,0" Content="编辑" Click="btnEditShopRemark_Click"></Button>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnCancelEditShopRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="0,0,0,0" Content="取消" Click="btnCancelEditShopRemark_Click" Visibility="Collapsed"></Button>
|
||||
</WrapPanel>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
|
||||
<TextBox Text="软件备注:" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
|
||||
<uc:UcWaterMarkTextBox x:Name="txtAppRemark" WaterMark="软件备注" Text="{Binding ItemOrder.soft_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
|
||||
VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnEditAppRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="2,0,0,0" Content="编辑" Click="btnEditAppRemark_Click"></Button>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnCancelEditAppRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
|
||||
Margin="0,0,0,0" Content="取消" Click="btnCancelEditAppRemark_Click" Visibility="Collapsed"></Button>
|
||||
</WrapPanel>
|
||||
</Grid>
|
||||
<!--操作-->
|
||||
@@ -313,7 +360,7 @@
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<!--<Button Grid.Column="1" Grid.Row="2" Background="Transparent" HorizontalAlignment="Center"
|
||||
Foreground="#409eff" BorderBrush="Transparent" Margin="4,0,0,0" Content="核对拍单" Click=""></Button>-->
|
||||
Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="核对拍单" Click=""></Button>-->
|
||||
<!--<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click"
|
||||
Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
|
||||
Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="关联拍单" Width="56" Height="24"/>-->
|
||||
@@ -323,6 +370,11 @@
|
||||
Content="{Binding BuyGoodsBtnTxt}" IsEnabled="{Binding IsBuyGoodsBtnEnabled}" Style="{StaticResource BasePageButtonLightStyle}"
|
||||
HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,0,0,0">
|
||||
</Button>
|
||||
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnDeleteTransitOrder" Click="btnDeleteTransitOrder_Click"
|
||||
Visibility="Collapsed" BorderBrush="{Binding BuyGoodsBtnColor}" Background="{Binding BuyGoodsBtnBackColor}" Foreground="{Binding BuyGoodsBtnColor}"
|
||||
Content="删除仓库订单" Style="{StaticResource BasePageButtonLightStyle}" HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,0,0,0">
|
||||
</Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.Converters;
|
||||
using _29WxOrderWpf.UserControls;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model;
|
||||
using AllBase.Model.Local;
|
||||
using CefSharp.DevTools.DOM;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -27,6 +29,7 @@ using Work;
|
||||
using Work._29Tools.BLL;
|
||||
using Work._29Tools.Forms.ShopForms;
|
||||
using Work._29Tools.Forms.ToolForms;
|
||||
using Work.BaseForms;
|
||||
using static System.Net.WebRequestMethods;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
@@ -82,14 +85,110 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
}
|
||||
|
||||
private void btnCopyRemark_Click(object sender, RoutedEventArgs e)
|
||||
private void btnEditShopRemark_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
if (shop == null)
|
||||
return;
|
||||
|
||||
if (btnEditShopRemark.Content.ParseToString() == "保存")
|
||||
{
|
||||
var notesRst = OrderListCtrl.addNotes(shop, orderItem.order_id, txtShopRemark.Text);
|
||||
if (!notesRst.Contains("\"code\":0"))
|
||||
{
|
||||
ShopBLL.CheckShopLogin(shop);
|
||||
BaseMsgForm.ShowError("保存失败请重试");
|
||||
return;
|
||||
}
|
||||
|
||||
btnCancelEditShopRemark.Visibility = Visibility.Collapsed;
|
||||
btnEditShopRemark.Content = "编辑";
|
||||
txtShopRemark.SetValue(WidthProperty, Double.NaN);
|
||||
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||
txtShopRemark.IsReadOnly = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
btnCancelEditShopRemark.Visibility = Visibility.Visible;
|
||||
btnEditShopRemark.Content = "保存";
|
||||
txtShopRemark.SetValue(WidthProperty, 135.0);
|
||||
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
|
||||
txtShopRemark.IsReadOnly = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnCancelEditShopRemark_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
btnCancelEditShopRemark.Visibility = Visibility.Collapsed;
|
||||
btnEditShopRemark.Content = "编辑";
|
||||
txtShopRemark.SetValue(WidthProperty, Double.NaN);
|
||||
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||
txtShopRemark.IsReadOnly = true;
|
||||
}
|
||||
|
||||
private void btnEditAppRemark_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
if (shop == null)
|
||||
return;
|
||||
|
||||
if (btnEditAppRemark.Content.ParseToString() == "保存")
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("order/wx_update_erp_soft_remark");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&order_id=" + orderItem.order_id;
|
||||
data += "&soft_remark=" + txtAppRemark.Text;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
|
||||
if (!html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgForm.ShowError("保存失败请重试");
|
||||
return;
|
||||
}
|
||||
if (BaseRegex.GetIntJson(ref html, "affected_rows") == 0)
|
||||
{
|
||||
BaseMsgForm.ShowError("未找到指定订单");
|
||||
return;
|
||||
}
|
||||
orderItem.ItemOrder.soft_remark = txtAppRemark.Text;
|
||||
|
||||
btnCancelEditAppRemark.Visibility = Visibility.Collapsed;
|
||||
btnEditAppRemark.Content = "编辑";
|
||||
txtAppRemark.SetValue(WidthProperty, Double.NaN);
|
||||
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||
txtAppRemark.IsReadOnly = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
btnCancelEditAppRemark.Visibility = Visibility.Visible;
|
||||
btnEditAppRemark.Content = "保存";
|
||||
txtAppRemark.SetValue(WidthProperty, 135.0);
|
||||
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
|
||||
txtAppRemark.IsReadOnly = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnCancelEditAppRemark_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
btnCancelEditAppRemark.Visibility = Visibility.Collapsed;
|
||||
btnEditAppRemark.Content = "编辑";
|
||||
txtAppRemark.SetValue(WidthProperty, Double.NaN);
|
||||
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||
txtAppRemark.IsReadOnly = true;
|
||||
}
|
||||
|
||||
private void btnBuyOrder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var orderItem = this.DataContext as oms_wei_order_item_info;
|
||||
var refundItem = orderItem.ItemRefund;
|
||||
if (orderItem == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单信息为空");
|
||||
@@ -110,7 +209,41 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
});
|
||||
Task.Run(() =>
|
||||
{
|
||||
// 拍单的时候检测一下买手号
|
||||
// 拍单前查询订单是否退款
|
||||
var orderId = orderItem.order_id;
|
||||
var skuId = orderItem.sku_id;
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
if (orderItem == null)
|
||||
return;
|
||||
// 如果是退款单,弹出退款窗口
|
||||
if (/*orderItem?.ItemRefund?.count > 0 &&*/ orderItem.refund_status > 1)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
if (shop != null)
|
||||
{
|
||||
WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
|
||||
shopLoginForm.openType = Work._29Tools.Forms.ShopForms.EnumOpenType.manage;
|
||||
shopLoginForm.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/aftersale/detail?orderid=" + orderItem.ItemRefund.after_sale_order_id;
|
||||
shopLoginForm.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单有售后,请去店铺后台退款");
|
||||
}
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 拍单前检测买手号是否在线
|
||||
if (GlobalConfig.CurrentPddBuyer.status == "在线")
|
||||
{
|
||||
PddMobileLoginForm.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
|
||||
@@ -125,59 +258,74 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return;
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("shop/get_shop_erp_merchant");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&corporate_account_user_id=" + orderItem.Shop.ErpCorporateAccountUserId;
|
||||
data += "&manage_user_id=" + orderItem.Shop.ErpManageUserId;
|
||||
data += "&shop_id=" + orderItem.Shop.ErpShopId;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
// 拍单前查询账户余额
|
||||
if (GlobalConfig.BuyConfig.IsUseAppBalance)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("未找到店铺账户!" + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
|
||||
{
|
||||
try
|
||||
{
|
||||
var erpMs = JsonHelper.DeserializeJsonToList<ErpMerchantInfo>(JsonHelper.JObjectParse(html)["data"].ParseToString());
|
||||
var erpM = erpMs.FirstOrDefault();
|
||||
if (erpM == null)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("未找到店铺账户!");
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
var balance = erpM.balance.ParseToDecimal();
|
||||
if (balance < 10)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("ERP账户余额不足(剩余" + balance.ToString("0.00") + "元,拍单至少需保留10元),无法中转拍单,请先充值!");
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch
|
||||
if (BaseClass.Balance < 10)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("拍单校验出错,请稍后重试");
|
||||
BaseMsgWindow.ShowError("软件快递余额不足(剩余" + BaseClass.Balance.ToString("0.00") + "元,拍单至少需保留10元),无法中转拍单,请先充值!");
|
||||
}));
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("shop/get_shop_erp_merchant");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&corporate_account_user_id=" + orderItem.Shop.ErpCorporateAccountUserId;
|
||||
data += "&manage_user_id=" + orderItem.Shop.ErpManageUserId;
|
||||
data += "&shop_id=" + orderItem.Shop.ErpShopId;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("未找到店铺账户!" + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
|
||||
{
|
||||
try
|
||||
{
|
||||
var erpMs = JsonHelper.DeserializeJsonToList<ErpMerchantInfo>(JsonHelper.JObjectParse(html)["data"].ParseToString());
|
||||
var erpM = erpMs.FirstOrDefault();
|
||||
if (erpM == null)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("未找到店铺账户!");
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
var balance = erpM.balance.ParseToDecimal();
|
||||
if (balance < 10)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("ERP账户余额不足(剩余" + balance.ToString("0.00") + "元,拍单至少需保留10元),无法中转拍单,请先充值!");
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError("拍单校验出错,请稍后重试");
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
}));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (orderItem.BuyGoodsBtnTxt == "去店铺后台绑定代发")
|
||||
@@ -303,6 +451,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
buyOrderForm.pnlMap.Visible = false;
|
||||
}
|
||||
buyOrderForm.ShowDialog();
|
||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||
}));
|
||||
});
|
||||
}
|
||||
@@ -315,6 +464,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
//if (order_item.BuyMap == null && order_item.ItemOrder.out_amount == 0)
|
||||
// txtProfitForecast.Visibility = Visibility.Visible;
|
||||
|
||||
btnDeleteTransitOrder.Visibility = Visibility.Collapsed;
|
||||
//if (BaseClass.SaLevel == 1 && order_item.ItemTransitOrder != null)
|
||||
//{
|
||||
// btnDeleteTransitOrder.Visibility = Visibility.Visible;
|
||||
//}
|
||||
|
||||
order_item.UpdateOrderItemBuyButton();
|
||||
|
||||
Task.Run(() =>
|
||||
@@ -442,6 +597,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
imgFrom.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
private void btnDeleteTransitOrder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -126,6 +126,7 @@ namespace _29WxOrderWpf.LoginWindows
|
||||
BaseMsgForm.ShowError(message, "登录失败");
|
||||
return;
|
||||
}
|
||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||
if (BaseClass.Remember)
|
||||
{
|
||||
Initialization i = new Initialization();
|
||||
|
||||
@@ -27,6 +27,9 @@
|
||||
VerticalAlignment="Center" VerticalContentAlignment="Center" Content="拍单软件" Grid.Column="1"></Label>
|
||||
<Label x:Name="lblVersion" FontSize="12" Margin="0,4,80,0" Foreground="{StaticResource mainColorLightBrush}" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top" VerticalContentAlignment="Center" Content="版本信息" Opacity="0.7" Grid.Column="4"></Label>
|
||||
|
||||
<Label x:Name="lblBalance" FontSize="12" Margin="0,25,80,0" HorizontalAlignment="Right" Foreground="#60ff66" MouseLeftButtonUp="lblBalance_MouseLeftButtonUp"
|
||||
VerticalAlignment="Top" VerticalContentAlignment="Center" Content="{Binding Balance}" Opacity="0.7" Grid.Column="4" Cursor="Hand"></Label>
|
||||
</Grid>
|
||||
<Grid x:Name="gridContainer" Grid.Row="1" Background="White" Margin="2,0,2,2">
|
||||
<Grid.ColumnDefinitions>
|
||||
|
||||
@@ -16,6 +16,7 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
@@ -38,16 +39,20 @@ using System.Windows.Shapes;
|
||||
using System.Xml.Linq;
|
||||
using Work;
|
||||
using Work._29Tools.BLL;
|
||||
using Work._29Tools.Forms.UserForms;
|
||||
|
||||
namespace _29WxOrderWpf
|
||||
{
|
||||
/// <summary>
|
||||
/// MainWindow.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class MainWindow : BaseWindow
|
||||
public partial class MainWindow : BaseWindow, INotifyPropertyChanged
|
||||
{
|
||||
public static MainWindow Instance { get; private set; }
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
public string Balance { get { return "快递余额:" + BaseClass.Balance.ToString("0.00"); } set { OnPropertyChanged("Balance"); } }
|
||||
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -88,6 +93,11 @@ namespace _29WxOrderWpf
|
||||
});
|
||||
}
|
||||
}
|
||||
protected virtual void OnPropertyChanged(string propertyName)
|
||||
{
|
||||
if (this.PropertyChanged != null)//有改变
|
||||
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
|
||||
#region 反抓包功能
|
||||
private void AutoAntiGrabbingMechanism()
|
||||
@@ -332,6 +342,7 @@ namespace _29WxOrderWpf
|
||||
#region 读取拼多多买手号
|
||||
public bool isGetPddBuyer = false;
|
||||
public bool hasGetPddBuyer = false;
|
||||
|
||||
/// <summary>
|
||||
/// 读取拼多多买手
|
||||
/// </summary>
|
||||
@@ -414,5 +425,11 @@ namespace _29WxOrderWpf
|
||||
hasGetPddBuyer = true;
|
||||
}
|
||||
#endregion
|
||||
|
||||
private void lblBalance_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
WXGetBalanceQrCodeForm balanceQrCodeForm = new WXGetBalanceQrCodeForm();
|
||||
balanceQrCodeForm.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Param.ConfigManage;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Config;
|
||||
using NaiBa.Util.Helper;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace _29WxOrderWpf
|
||||
{
|
||||
public class StartUp
|
||||
{
|
||||
public static void Init()
|
||||
{
|
||||
GlobalConfig.BuyConfig = ConfigHelper.LoadConfig<BuyConfig>("buy_config_260708");
|
||||
if (GlobalConfig.BuyConfig == null)
|
||||
GlobalConfig.BuyConfig = new BuyConfig();
|
||||
}
|
||||
|
||||
public static void SaveBuyConfig()
|
||||
{
|
||||
ConfigHelper.SaveConfig("buy_config_260708", GlobalConfig.BuyConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,5 +21,9 @@
|
||||
<SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa"/>
|
||||
|
||||
<SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa"/>
|
||||
<SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF"/>
|
||||
<SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF"/>
|
||||
|
||||
<SolidColorBrush x:Key="PageOkBrush" Color="#FF67c23a" />
|
||||
<SolidColorBrush x:Key="PageWarningBrush" Color="#FFfa4733" />
|
||||
<SolidColorBrush x:Key="PageLinkBrush" Color="#409eff" />
|
||||
</ResourceDictionary>
|
||||
Reference in new issue
Block a user