商品优化功能,筛选功能优化

This commit is contained in:
wule committed 2026-08-28 19:05:00 +08:00
1 parent aeb30c1171
commit c70fa07d7d
15 files changed
+1600 -68

No files matched your search

@@ -622,7 +622,22 @@
<TabItem
MinWidth="60"
Header="待发货"
SizeChanged="TabItem_SizeChanged" />
SizeChanged="TabItem_SizeChanged">
<Border
Margin="4,0,4,4"
BorderBrush="#e0e0e0"
BorderThickness="0,0,0,1">
<CheckBox
x:Name="chkDirectSendFailed"
Margin="6,8"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkDirectSendFailed_Click"
Content="直拍发货失败"
FontSize="12" />
</Border>
</TabItem>
<TabItem
MinWidth="60"
Background="Transparent"
@@ -1014,17 +1029,37 @@
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button
x:Name="btnBatchRefund2"
Grid.Column="1"
Height="20"
MinWidth="48"
Margin="6,6"
Padding="4,0"
Click="btnBatchRefund_Click"
Content="批量申请买手售后"
FontSize="12"
Style="{StaticResource BasePageButtonStyle}" />
<WrapPanel>
<Button
x:Name="btnBatchRefund2"
Grid.Column="1"
Height="20"
MinWidth="48"
Margin="6,6"
Padding="4,0"
Click="btnBatchRefund_Click"
Content="批量申请买手售后"
FontSize="12"
Style="{StaticResource BasePageButtonStyle}" />
<CheckBox
x:Name="chkShopIsRefund"
Grid.Column="0"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkShopIsRefund_Click"
Content="店铺已退款"
FontSize="12" />
<CheckBox
x:Name="chkShopIsNotRefund"
Grid.Column="1"
Margin="6,8"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkShopIsRefund_Click"
Content="店铺未退款"
FontSize="12" />
</WrapPanel>
</Grid>
</Border>
</TabItem>
@@ -1450,15 +1450,25 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
return true;
}
if (filterHeadStr.StartsWith("待发货") && !order.IsWaitSend)
if (filterHeadStr.StartsWith("待发货"))
{
return true;
if (!order.IsWaitSend)
return true;
// 直拍发货失败
if (chkDirectSendFailed.IsChecked == true)
{
var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
if (!rst2)
return true;
}
}
if (filterHeadStr.StartsWith("待收货"))
{
if (!order.IsWaitReceive)
return true;
// 需核对物流
if (chkNeedCheckExpress.IsChecked == true)
{
var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功"));
@@ -1547,6 +1557,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
if (!order.IsEmergencyDistribReturnOrder)
return true;
// 退款完成(但买手没退)
if (chkShopIsRefund.IsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
return true;
// 退款中
else if (chkShopIsNotRefund.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
return true;
}
if (filterHeadStr.StartsWith("售后完成单"))
{
@@ -2543,6 +2559,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
FilterOrders();
}
private void chkShopIsRefund_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
chkShopIsRefund.IsChecked = chkShopIsNotRefund.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
}
private void chkDirectSendFailed_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
chkDirectSendFailed.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
}
}
public class OrderFilterConfig : PropertyNotifyObject
@@ -66,9 +66,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
shop.Is29Supplier = false;
for (int i = 0; i < 100; i++)
{
var is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
var is29SupplierRst = WxSimOrderSupplierBLL.GetWxSupplierListV2(shop);
if (!is29SupplierRst.Contains("\"code\":0"))
is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
is29SupplierRst = WxSimOrderSupplierBLL.GetWxSupplierListV2(shop);
if (is29SupplierRst.Contains("\"code\":0") && is29SupplierRst.Contains("\"name\":\"29供货商\""))
{
shop.Is29Supplier = true;
@@ -159,47 +159,60 @@
TextWrapping="Wrap"
WaterMark="规格" />
<TextBox
Grid.Row="4"
Grid.Column="1"
Margin="0,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="平台商品ID:" />
<uc:UcWaterMarkTextBox1
Grid.Row="4"
Grid.Column="1"
Margin="72,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding product_id}"
TextWrapping="Wrap"
WaterMark="平台商品ID" />
<WrapPanel Grid.Row="4">
<TextBox
Grid.Row="4"
Grid.Column="1"
Margin="0,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="平台商品ID:" />
<uc:UcWaterMarkTextBox1
Grid.Row="4"
Grid.Column="1"
Margin="-9,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding product_id}"
TextWrapping="Wrap"
WaterMark="平台商品ID" />
<Button
x:Name="btnOptimizeProduct"
MinWidth="48"
MinHeight="16"
Margin="2,0,0,0"
Padding="2,0"
Click="btnOptimizeProduct_Click"
Content="优化订单商品"
Style="{StaticResource BasePageButtonLightStyle}" />
</WrapPanel>
<WrapPanel Grid.Row="5">
<TextBox
Grid.Row="5"
Grid.Column="1"
Margin="0,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="系统商品ID:" />
<uc:UcWaterMarkTextBox1
Grid.Row="5"
Grid.Column="1"
Margin="-9,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding out_product_id}"
TextWrapping="Wrap"
WaterMark="系统商品ID" />
</WrapPanel>
<TextBox
Grid.Row="5"
Grid.Column="1"
Margin="0,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="系统商品ID:" />
<uc:UcWaterMarkTextBox1
Grid.Row="5"
Grid.Column="1"
Margin="72,2,4,2"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding out_product_id}"
TextWrapping="Wrap"
WaterMark="系统商品ID" />
<TextBox
Grid.Row="6"
Grid.Column="1"
@@ -397,6 +397,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 拍单前查询账户余额
if (!isAbnormalOrder)
{
// 强制使用软件而非erp拍单
if (GlobalConfig.BuyConfig.IsUseAppBalance)
{
if (BaseClass.Balance < 10)
@@ -1564,6 +1565,25 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
});
}
}
private void btnOptimizeProduct_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
WXOrderListOptimizeForm form = new WXOrderListOptimizeForm(orderItem.Shop);
form.lblOrderId.Text = orderItem.order_id;
form.lblSpuId.Text = orderItem.product_id;
form.lblSkuId.Text = orderItem.sku_id; // skuId
form.txtGoodsName.Text = orderItem.title; // 商品名称
form.txtSkuName.Text = orderItem.sku_attr_str; // sku规格名称
form.txtOrderPrice.Text = "" + (orderItem.real_price.ParseToInt() / 100m / orderItem.sku_cnt); // 订单价格
//form.txtCurrentPrice.Text = row.Cells["colCurrentPrice"].Value.ParseToString(); // 当前商品价格
//form.txtCurrentStock.Text = row.Cells["colCurrentStock"].Value.ParseToString(); // 当前库存;
form.numAddPrice.Value = 0;
form.ShowDialog();
}
}
}
}
+2 -2
View File
@@ -296,9 +296,9 @@ namespace _29WxOrderWpf
shop.Is29Supplier = false;
for (int i = 0; i < 100; i++)
{
var is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
var is29SupplierRst = WxSimOrderSupplierBLL.GetWxSupplierListV2(shop);
if (!is29SupplierRst.Contains("\"code\":0"))
is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
is29SupplierRst = WxSimOrderSupplierBLL.GetWxSupplierListV2(shop);
if (is29SupplierRst.Contains("\"code\":0") && is29SupplierRst.Contains("\"name\":\"29供货商\""))
{
shop.Is29Supplier = true;