1可设置是否直发拍单 2优化订单取号状态判断逻辑
This commit is contained in:
1 parent
9789a4686f
commit
5b9ed01fa1
7 files changed
+125
-65
No files matched your search
@@ -31,7 +31,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public partial class OrderListRowHeaderCtrl : UserControl
|
public partial class OrderListRowHeaderCtrl : UserControl
|
||||||
{
|
{
|
||||||
public DateTime LastRefreshTime = DateTime.Now;
|
public static DateTime LastRefreshTime = DateTime.Now.AddSeconds(-5);
|
||||||
|
|
||||||
public OrderListRowHeaderCtrl()
|
public OrderListRowHeaderCtrl()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,55 +1,78 @@
|
|||||||
<Window
|
<Window
|
||||||
x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView"
|
x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings"
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:vm="clr-namespace:_29WxOrderWpf.ViewModels"
|
xmlns:vm="clr-namespace:_29WxOrderWpf.ViewModels"
|
||||||
xmlns:wpf="WPFCommon"
|
xmlns:wpf="WPFCommon"
|
||||||
Title="设置"
|
Title="设置"
|
||||||
Width="800"
|
Width="800"
|
||||||
Height="450"
|
Height="450"
|
||||||
d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}"
|
d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}"
|
||||||
ResizeMode="NoResize"
|
ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
WindowState="Normal"
|
WindowState="Normal"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Border BorderBrush="#e8eaed" BorderThickness="1">
|
<Border BorderBrush="#e8eaed" BorderThickness="1">
|
||||||
<TabControl
|
<TabControl
|
||||||
ItemContainerStyle="{StaticResource SideTabItem}"
|
ItemContainerStyle="{StaticResource SideTabItem}"
|
||||||
Style="{StaticResource SideTabControl}"
|
Style="{StaticResource SideTabControl}"
|
||||||
TabStripPlacement="Left">
|
TabStripPlacement="Left">
|
||||||
|
|
||||||
<TabItem Header="发货">
|
<TabItem Header="拍单">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<Border Style="{StaticResource SettingRow}">
|
<Border Style="{StaticResource SettingRow}">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Style="{StaticResource SettingTitle}" Text="礼品单发送" />
|
<TextBlock Style="{StaticResource SettingTitle}" Text="直发拍单" />
|
||||||
<TextBlock Style="{StaticResource SettingDesc}" Text="超出6元自动改为礼品二(实物)" />
|
<TextBlock Style="{StaticResource SettingDesc}" Text="允许直发拍单" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox
|
<CheckBox
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Visibility="Visible"
|
d:Visibility="Visible"
|
||||||
IsChecked="{Binding AutoSwitchGiftType}"
|
IsChecked="{Binding SwitchEnableDirectBuy}"
|
||||||
IsEnabled="False"
|
Style="{StaticResource ToggleSwitch}" />
|
||||||
Opacity="0.5"
|
</Grid>
|
||||||
Style="{StaticResource ToggleSwitch}"
|
</Border>
|
||||||
Visibility="Collapsed" />
|
</StackPanel>
|
||||||
</Grid>
|
</TabItem>
|
||||||
</Border>
|
|
||||||
</StackPanel>
|
|
||||||
</TabItem>
|
|
||||||
|
|
||||||
<!-- ========== 外观 ========== -->
|
<TabItem Header="发货">
|
||||||
<!--
|
<StackPanel>
|
||||||
|
<Border Style="{StaticResource SettingRow}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<StackPanel>
|
||||||
|
<TextBlock Style="{StaticResource SettingTitle}" Text="礼品单发送" />
|
||||||
|
<TextBlock Style="{StaticResource SettingDesc}" Text="超出6元自动改为礼品二(实物)" />
|
||||||
|
</StackPanel>
|
||||||
|
<CheckBox
|
||||||
|
Grid.Column="1"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
d:Visibility="Visible"
|
||||||
|
IsChecked="{Binding AutoSwitchGiftType}"
|
||||||
|
IsEnabled="False"
|
||||||
|
Opacity="0.5"
|
||||||
|
Style="{StaticResource ToggleSwitch}"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</StackPanel>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
|
<!-- ========== 外观 ========== -->
|
||||||
|
<!--
|
||||||
<TabItem Header="外观" Tag="🎨">
|
<TabItem Header="外观" Tag="🎨">
|
||||||
<StackPanel
|
<StackPanel
|
||||||
MaxWidth="720"
|
MaxWidth="720"
|
||||||
@@ -114,8 +137,8 @@
|
|||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<!-- ========== 账户 ========== -->
|
<!-- ========== 账户 ========== -->
|
||||||
<!--
|
<!--
|
||||||
<TabItem Header="账户" Tag="👤">
|
<TabItem Header="账户" Tag="👤">
|
||||||
<StackPanel
|
<StackPanel
|
||||||
MaxWidth="720"
|
MaxWidth="720"
|
||||||
@@ -161,8 +184,8 @@
|
|||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<!-- ========== 隐私 ========== -->
|
<!-- ========== 隐私 ========== -->
|
||||||
<!--
|
<!--
|
||||||
<TabItem Header="隐私" Tag="🔒">
|
<TabItem Header="隐私" Tag="🔒">
|
||||||
<StackPanel
|
<StackPanel
|
||||||
MaxWidth="720"
|
MaxWidth="720"
|
||||||
@@ -212,8 +235,8 @@
|
|||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<!-- ========== 关于 ========== -->
|
<!-- ========== 关于 ========== -->
|
||||||
<!--
|
<!--
|
||||||
<TabItem Header="关于" Tag="{StaticResource txt-table_stack_above}">
|
<TabItem Header="关于" Tag="{StaticResource txt-table_stack_above}">
|
||||||
<StackPanel
|
<StackPanel
|
||||||
MaxWidth="720"
|
MaxWidth="720"
|
||||||
@@ -251,6 +274,6 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem>-->
|
</TabItem>-->
|
||||||
|
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</Border>
|
</Border>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using _29WxOrderWpf.ViewModels;
|
using _29WxOrderWpf.ViewModels;
|
||||||
using AllBase;
|
using AllBase;
|
||||||
|
using AllBase.Helper;
|
||||||
using AllBase.Model.Config;
|
using AllBase.Model.Config;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using System;
|
using System;
|
||||||
@@ -44,6 +45,15 @@ public partial class SettingsView : Window
|
|||||||
var setting = vm.ToConfig();
|
var setting = vm.ToConfig();
|
||||||
BaseClass.Setting = setting;
|
BaseClass.Setting = setting;
|
||||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig(SettingViewModel.SettingFileName, JsonConvert.SerializeObject(setting));
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig(SettingViewModel.SettingFileName, JsonConvert.SerializeObject(setting));
|
||||||
|
|
||||||
|
foreach (var order in GlobalConfig.lstOrder)
|
||||||
|
{
|
||||||
|
foreach (var orderItem in order.orderItems)
|
||||||
|
{
|
||||||
|
orderItem.UpdateOrderItemBuyButton();
|
||||||
|
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -26,15 +26,22 @@ public class SettingViewModel : BindableBaseEx
|
|||||||
get => GetValue<bool>();
|
get => GetValue<bool>();
|
||||||
set => SetValue(value);
|
set => SetValue(value);
|
||||||
}
|
}
|
||||||
|
public bool SwitchEnableDirectBuy
|
||||||
|
{
|
||||||
|
get => GetValue<bool>();
|
||||||
|
set => SetValue(value);
|
||||||
|
}
|
||||||
public void Assign(SettingConfig config)
|
public void Assign(SettingConfig config)
|
||||||
{
|
{
|
||||||
AutoSwitchGiftType = config.AutoSwitchGiftType;
|
AutoSwitchGiftType = config.AutoSwitchGiftType;
|
||||||
|
SwitchEnableDirectBuy = config.SwitchEnableDirectBuy;
|
||||||
}
|
}
|
||||||
public SettingConfig ToConfig()
|
public SettingConfig ToConfig()
|
||||||
{
|
{
|
||||||
return new SettingConfig
|
return new SettingConfig
|
||||||
{
|
{
|
||||||
AutoSwitchGiftType = AutoSwitchGiftType
|
AutoSwitchGiftType = AutoSwitchGiftType,
|
||||||
|
SwitchEnableDirectBuy = SwitchEnableDirectBuy,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -15,4 +15,11 @@ public class SettingConfig
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool AutoSwitchGiftType { get; set; } = true;
|
public bool AutoSwitchGiftType { get; set; } = true;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region 拍单
|
||||||
|
/// <summary>
|
||||||
|
/// 允许直发拍单
|
||||||
|
/// </summary>
|
||||||
|
public bool SwitchEnableDirectBuy { get; set; } = false;
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
@@ -1557,20 +1557,27 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
// 直拍按钮
|
// 直拍按钮
|
||||||
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||||
if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30)
|
||||||
{
|
|
||||||
}
|
|
||||||
else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
|
||||||
{
|
{
|
||||||
|
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||||
|
//{
|
||||||
|
//}
|
||||||
|
//else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
||||||
|
//{
|
||||||
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
|
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
|
||||||
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
||||||
if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
|
else if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
|
||||||
{
|
{
|
||||||
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
|
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
|
||||||
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")
|
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")
|
||||||
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string RefundStatusStr
|
public string RefundStatusStr
|
||||||
|
|||||||
@@ -121,9 +121,15 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
|||||||
transitDetail.TransitStatus = "创建失败";
|
transitDetail.TransitStatus = "创建失败";
|
||||||
else if (transitOrder.transfer_warehouse_status == 3)
|
else if (transitOrder.transfer_warehouse_status == 3)
|
||||||
transitDetail.TransitStatus = "创建中";
|
transitDetail.TransitStatus = "创建中";
|
||||||
|
else if (transitOrder.transfer_warehouse_status == 4)
|
||||||
|
transitDetail.TransitStatus = "取号失败";
|
||||||
|
|
||||||
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
|
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
|
||||||
if (transitOrder.pickup_time > DateTime.MinValue == false)
|
if (transitOrder.transfer_warehouse_status == 4)
|
||||||
|
transitDetail.WarehouseStatus = "取号失败";
|
||||||
|
else if ((transitOrder.raw_message.ParseToString().Contains("取号异常") || transitOrder.raw_message.ParseToString().Contains("无法调用")) && transitOrder.transfer_warehouse_status != 1)
|
||||||
|
transitDetail.WarehouseStatus = transitOrder.raw_message.Contains("超出派送范围") ? "取号异常(超区)" : "取号异常";
|
||||||
|
else if (transitOrder.pickup_time > DateTime.MinValue == false)
|
||||||
transitDetail.WarehouseStatus = "未取号";
|
transitDetail.WarehouseStatus = "未取号";
|
||||||
else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
|
else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
|
||||||
transitDetail.WarehouseStatus = "未入库";
|
transitDetail.WarehouseStatus = "未入库";
|
||||||
|
|||||||
Reference in new issue
Block a user