Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder
This commit is contained in:
commit
fd0ff6771f
5 files changed
+24
-11
No files matched your search
@@ -344,7 +344,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}));
|
}));
|
||||||
int page = 0;
|
int page = 0;
|
||||||
int totalPage = 1;
|
int totalPage = 1;
|
||||||
int pageSize = 200;
|
int pageSize = 50;
|
||||||
|
#if DEBUG
|
||||||
|
pageSize = 200;
|
||||||
|
#endif
|
||||||
|
|
||||||
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
||||||
{
|
{
|
||||||
@@ -1838,7 +1841,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return FilterTabPage(order, filterHeadStr);
|
try
|
||||||
|
{
|
||||||
|
return FilterTabPage(order, filterHeadStr);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
BaseMsgWindow.ShowAnimateMessage("订单 " + order.order_id + " 子筛选发生错误:" + ex.Message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -2023,14 +2034,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
//if (chkReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
|
//if (chkReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
|
||||||
// return true;
|
// return true;
|
||||||
//// 非退货仓
|
//// 非退货仓
|
||||||
//else if (chkNotReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
//else if (chkNotReturnOrderAddressIsChecked == true && order.orderItems?.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
||||||
// return true;
|
// return true;
|
||||||
|
|
||||||
// 商家受理中
|
// 商家受理中
|
||||||
if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "商家受理中"))
|
if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "商家受理中"))
|
||||||
return true;
|
return true;
|
||||||
// 待商家收货
|
// 待商家收货
|
||||||
if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "待商家收货"))
|
if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "待商家收货"))
|
||||||
return true;
|
return true;
|
||||||
// 退款完成(但买手没退)
|
// 退款完成(但买手没退)
|
||||||
if (chkEmergencyShopAfterSaleSuccessIsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
if (chkEmergencyShopAfterSaleSuccessIsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
||||||
@@ -2040,10 +2051,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
// 退货退款
|
// 退货退款
|
||||||
if (chkEmergencyReturnIsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN"))
|
if (chkEmergencyReturnIsChecked == true && !(order.refundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN"))
|
||||||
return true;
|
return true;
|
||||||
// 仅退款
|
// 仅退款
|
||||||
else if (chkEmergencyRefundIsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND"))
|
else if (chkEmergencyRefundIsChecked == true && !(order.refundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND"))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (filterHeadStr.StartsWith("退货仓自动售后单"))
|
if (filterHeadStr.StartsWith("退货仓自动售后单"))
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
<ColumnDefinition Width="120*" />
|
<ColumnDefinition Width="120*" />
|
||||||
<ColumnDefinition Width="72*" />
|
<ColumnDefinition Width="72*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock
|
<TextBlock d:Text="No.1"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" />
|
Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" />
|
||||||
|
|||||||
@@ -796,7 +796,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
// }));
|
// }));
|
||||||
//});
|
//});
|
||||||
|
|
||||||
var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
||||||
|
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/85|imageMogr2/auto-orient=");
|
||||||
|
var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
||||||
imgOrderItem.Source = bImg;
|
imgOrderItem.Source = bImg;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace AllBase
|
|||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public static int VersionCount = 332;
|
public static int VersionCount = 335;
|
||||||
|
|
||||||
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||||
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
||||||
|
|||||||
@@ -484,7 +484,7 @@ namespace AllBase
|
|||||||
if (width != null && height != null)
|
if (width != null && height != null)
|
||||||
{
|
{
|
||||||
bitmap.DecodePixelWidth = width.Value;
|
bitmap.DecodePixelWidth = width.Value;
|
||||||
bitmap.DecodePixelHeight = height.Value;
|
//bitmap.DecodePixelHeight = height.Value;
|
||||||
}
|
}
|
||||||
bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
|
bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
|
||||||
bitmap.CacheOption = BitmapCacheOption.OnLoad; // 或者使用 BitmapCacheOption.OnLoad 以减少内存使用
|
bitmap.CacheOption = BitmapCacheOption.OnLoad; // 或者使用 BitmapCacheOption.OnLoad 以减少内存使用
|
||||||
|
|||||||
Reference in new issue
Block a user