优化订单读取卡顿问题
This commit is contained in:
1 parent
c83521f36d
commit
1509e0a11d
15 files changed
+600
-424
No files matched your search
@@ -15,6 +15,9 @@ namespace _29WxOrderWpf.Converters
|
||||
{
|
||||
ListBoxItem item = (ListBoxItem)value;
|
||||
ListBox listView = ItemsControl.ItemsControlFromItemContainer(item) as ListBox;
|
||||
if (listView == null)
|
||||
return 0;
|
||||
|
||||
return listView.ItemContainerGenerator.IndexFromContainer(item) + 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -299,7 +299,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
|
||||
{
|
||||
var cookie1 = request.Headers["Cookie"];
|
||||
Task.Run(() =>
|
||||
Task.Run(async() =>
|
||||
{
|
||||
var url1 = url;
|
||||
var data1 = responseData;
|
||||
@@ -342,7 +342,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 已发货 第一页
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=3")) //https://mobile.yangkeduo.com/orders.html?type=3
|
||||
{
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
if (data1.Contains("display_amount"))
|
||||
{
|
||||
@@ -367,7 +367,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 待发货 第一页
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=2"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
if (data1.Contains("display_amount"))
|
||||
{
|
||||
@@ -394,7 +394,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (/*(cefAddress.Contains("orders.html")) &&*/ url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/aristotle/order_list_v"))
|
||||
//https://mobile.yangkeduo.com/proxy/api/api/aristotle/order_list_v4?pdduid=6766109923730
|
||||
{
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
CefReadBuyerOrder(url1, data1);
|
||||
});
|
||||
@@ -403,7 +403,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 售后 第一页
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/complaint_list.html"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
if (data1.Contains("listItemStatusVo") && data1.Contains("afterSalesId") && data1.Contains("statusText"))
|
||||
{
|
||||
@@ -432,7 +432,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 读取售后
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/blade/after_sales_list"))
|
||||
{
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
CefReadBuyerAfterSale(url1, data1);
|
||||
});
|
||||
@@ -590,7 +590,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
pdd_order.WxOrderStatus = wx_order?.status;
|
||||
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.ShopOrderSkuNameStr = wx_order_item?.SkuAttrStr;
|
||||
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) ? "店铺售后" : "";
|
||||
if (wx_order_item?.refund_status > 1)
|
||||
@@ -625,7 +625,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
pdd_afterSale.ShopIdStr = (wx_order?.shop_id).ParseToString();
|
||||
pdd_afterSale.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
|
||||
pdd_afterSale.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
|
||||
pdd_afterSale.ShopOrderSkuNameStr = wx_order_item?.sku_attr_str;
|
||||
pdd_afterSale.ShopOrderSkuNameStr = wx_order_item?.SkuAttrStr;
|
||||
pdd_afterSale.WxOrderCreateTime = wx_order_item?.ItemOrder?.create_time == null ? DateTime.MinValue : BaseClass.StampToDateTime((wx_order_item?.ItemOrder?.create_time).ParseToInt());
|
||||
pdd_afterSale.ShopOrderRefundStr = ""; // (/*refund_item?.count > 0 &&*/ wx_order_item?.refund_status > 1) ? "店铺售后" : "";
|
||||
if (wx_order_item?.refund_status > 1)
|
||||
@@ -758,7 +758,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.sku_attr_str;
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
if (wxOrderItem?.refund_status > 1)
|
||||
{
|
||||
o.ShopOrderRefundStr = "店铺售后";
|
||||
@@ -1107,7 +1107,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.sku_attr_str;
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
af.ShopOrderOutAfterSaleStatusStr = wxOrder.out_after_sale_status;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -343,9 +343,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
this.txtShopSkuIdVal = orderItem.sku_id;
|
||||
this.txtShopGoodsIdVal = orderItem.product_id;
|
||||
this.txtSpuCodeVal = orderItem.out_product_id.IsNullOrEmpty() ? orderItem.product_id : orderItem.out_product_id;
|
||||
this.txtSkuCodeVal = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.sku_attr_str : orderItem.out_sku_id;
|
||||
this.txtSkuCodeVal = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.SkuAttrStr : orderItem.out_sku_id;
|
||||
this.txtShopGoodsNameVal = orderItem.title;
|
||||
this.txtShopSpecNameVal = orderItem.sku_attr_str;
|
||||
this.txtShopSpecNameVal = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
|
||||
@@ -994,9 +994,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var item in order.orderItems)
|
||||
{
|
||||
if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
|
||||
(item.out_product_id == tbBuyMap.spu_code && item.sku_attr_str == tbBuyMap.sku_code) ||
|
||||
(item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
|
||||
(item.product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
|
||||
(item.product_id == tbBuyMap.spu_code && item.sku_attr_str == tbBuyMap.sku_code))
|
||||
(item.product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code))
|
||||
{
|
||||
item.TbBuyMap = tbBuyMap;
|
||||
|
||||
|
||||
@@ -343,9 +343,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
this.txtShopSkuIdVal = orderItem.sku_id;
|
||||
this.txtShopGoodsIdVal = orderItem.product_id;
|
||||
this.txtSpuCodeVal = orderItem.out_product_id.IsNullOrEmpty() ? orderItem.product_id : orderItem.out_product_id;
|
||||
this.txtSkuCodeVal = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.sku_attr_str : orderItem.out_sku_id;
|
||||
this.txtSkuCodeVal = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.SkuAttrStr : orderItem.out_sku_id;
|
||||
this.txtShopGoodsNameVal = orderItem.title;
|
||||
this.txtShopSpecNameVal = orderItem.sku_attr_str;
|
||||
this.txtShopSpecNameVal = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
|
||||
@@ -1708,9 +1708,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var item in order.orderItems)
|
||||
{
|
||||
if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
|
||||
(item.out_product_id == tbBuyMap.spu_code && item.sku_attr_str == tbBuyMap.sku_code) ||
|
||||
(item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
|
||||
(item.product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
|
||||
(item.product_id == tbBuyMap.spu_code && item.sku_attr_str == tbBuyMap.sku_code))
|
||||
(item.product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code))
|
||||
{
|
||||
item.TbBuyMap = tbBuyMap;
|
||||
|
||||
|
||||
@@ -510,7 +510,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
tb_order.WxOrderStatus = wx_order?.status;
|
||||
tb_order.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
|
||||
tb_order.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
|
||||
tb_order.ShopOrderSkuNameStr = wx_order_item?.sku_attr_str;
|
||||
tb_order.ShopOrderSkuNameStr = wx_order_item?.SkuAttrStr;
|
||||
tb_order.WxOrderCreateTime = wx_order_item?.ItemOrder?.create_time == null ? DateTime.MinValue : BaseClass.StampToDateTime((wx_order_item?.ItemOrder?.create_time).ParseToInt());
|
||||
tb_order.ShopOrderRefundStr = ""; // (/*refund_item?.count > 0 &&*/ wx_order_item.refund_status > 1) ? "店铺售后" : "";
|
||||
if (wx_order_item?.refund_status > 1)
|
||||
@@ -545,7 +545,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
tb_afterSale.ShopIdStr = (wx_order?.shop_id).ParseToString();
|
||||
tb_afterSale.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
|
||||
tb_afterSale.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
|
||||
tb_afterSale.ShopOrderSkuNameStr = wx_order_item?.sku_attr_str;
|
||||
tb_afterSale.ShopOrderSkuNameStr = wx_order_item?.SkuAttrStr;
|
||||
tb_afterSale.WxOrderCreateTime = wx_order_item?.ItemOrder?.create_time == null ? DateTime.MinValue : BaseClass.StampToDateTime((wx_order_item?.ItemOrder?.create_time).ParseToInt());
|
||||
tb_afterSale.ShopOrderRefundStr = ""; // (/*refund_item?.count > 0 &&*/ wx_order_item?.refund_status > 1) ? "店铺售后" : "";
|
||||
if (wx_order_item?.refund_status > 1)
|
||||
@@ -789,7 +789,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.sku_attr_str;
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
if (wxOrderItem?.refund_status > 1)
|
||||
{
|
||||
o.ShopOrderRefundStr = "店铺售后";
|
||||
@@ -1145,7 +1145,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.sku_attr_str;
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
af.ShopOrderOutAfterSaleStatusStr = wxOrder.out_after_sale_status;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,6 +145,7 @@
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="Transparent"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="cmbTimeType_SelectionChanged"
|
||||
Style="{StaticResource RoundedComboBox}"
|
||||
Text="更新时间">
|
||||
<ComboBoxItem>
|
||||
@@ -169,7 +170,8 @@
|
||||
Grid.Column="7"
|
||||
Margin="0,0,14,0"
|
||||
VerticalAlignment="Center"
|
||||
BorderThickness="0" />
|
||||
BorderThickness="0"
|
||||
SelectedDate="{Binding DateStart}" />
|
||||
|
||||
<!-- 结束时间 -->
|
||||
<Border
|
||||
@@ -185,7 +187,8 @@
|
||||
Grid.Column="8"
|
||||
Margin="10,0,4,0"
|
||||
VerticalAlignment="Center"
|
||||
BorderThickness="0" />
|
||||
BorderThickness="0"
|
||||
SelectedDate="{Binding DateEnd}" />
|
||||
<CheckBox
|
||||
x:Name="chkEndDate"
|
||||
Grid.Column="8"
|
||||
@@ -193,6 +196,7 @@
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
BorderBrush="{StaticResource mainColorBrush}"
|
||||
Click="chkEndDate_Click"
|
||||
FontSize="12" />
|
||||
|
||||
<Button
|
||||
@@ -600,9 +604,10 @@
|
||||
</TabControl.Resources>
|
||||
<TabItem
|
||||
MinWidth="60"
|
||||
d:Header="待采购"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Header="待采购"
|
||||
Header="{Binding WaitBuyTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged">
|
||||
<Border
|
||||
Padding="0,10"
|
||||
@@ -690,7 +695,8 @@
|
||||
SizeChanged="TabItem_SizeChanged" />
|
||||
<TabItem
|
||||
MinWidth="60"
|
||||
Header="待发货"
|
||||
d:Header="待发货"
|
||||
Header="{Binding WaitSendTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged">
|
||||
<Border
|
||||
Margin="4,0,4,4"
|
||||
@@ -729,9 +735,10 @@
|
||||
</TabItem>
|
||||
<TabItem
|
||||
MinWidth="60"
|
||||
d:Header="待收货"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Header="待收货"
|
||||
Header="{Binding WaitReceiveTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged">
|
||||
<Border
|
||||
Margin="4,0,4,4"
|
||||
@@ -1487,7 +1494,9 @@
|
||||
HorizontalContentAlignment="Stretch"
|
||||
BorderThickness="0"
|
||||
ScrollViewer.CanContentScroll="True"
|
||||
VirtualizingPanel.ScrollUnit="Pixel">
|
||||
VirtualizingPanel.ScrollUnit="Pixel"
|
||||
VirtualizingStackPanel.IsVirtualizing="True"
|
||||
VirtualizingStackPanel.VirtualizationMode="Recycling">
|
||||
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
|
||||
<ListBox.ItemContainerStyle>
|
||||
<Style TargetType="ListBoxItem">
|
||||
|
||||
@@ -73,6 +73,92 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("orderFilterConfig"));
|
||||
}
|
||||
}
|
||||
|
||||
string cmbReturnOrderBuyerStatusText = string.Empty;
|
||||
string cmbReturnPackageStatusText = string.Empty;
|
||||
string cmbReturnOrderStatusText = "";
|
||||
string cmbRejectStatusText = "";
|
||||
bool chkAftersaleWarehouseIsPickupIsChecked, chkAftersaleWarehouseIsNotPickupIsChecked;
|
||||
bool chkAftersaleBuyerIsBuyIsChecked;
|
||||
bool chkUpShopAddressAnalyseFailedIsChecked;
|
||||
bool chkEmergencyReturnIsChecked, chkEmergencyRefundIsChecked;
|
||||
bool chkEmergencyWaitSupplierReceiveIsChecked, chkEmergencyWaitSupplierAcceptIsChecked, chkEmergencyShopAfterSaleSuccessIsChecked, chkEmergencyShopInAfterSaleIsChecked;
|
||||
bool chkEmergencyShopCustomRefundHasWaybillIsChecked, chkEmergencyShopCustomRefundNoWaybillIsChecked;
|
||||
bool chkEmergencyBuyerWaitAfterSaleIsChecked, chkEmergencyBuyerWaitSendBackIsChecked, chkEmergencyBuyerWaitSupplierRefundIsChecked, chkEmergencyBuyerRefundFailIsChecked;
|
||||
bool chk48HourNoWaybillIsChecked, chk72HourNoWaybillIsChecked;
|
||||
bool chkWaitReceiveWarehouseIsNotPickupIsChecked, chkWaitReceiveWarehouseIsPickupIsChecked, chkWaitReceiveWarehouseIsSendOutIsChecked;
|
||||
bool chkWaitReceiveBuyerIsSendIsChecked = false, chkWaitReceiveBuyerIsNotSendIsChecked = false, chkWaitReceiveBuyerIsInWarehouseIsChecked = false;
|
||||
bool chkAftersaleIsSendIsChecked = false, chkAftersaleIsNotSendIsChecked = false;
|
||||
bool chkShopIsNotRefundIsChecked = false, chkShopIsRefundIsChecked = false;
|
||||
bool chkNeedCheckExpressIsChecked = false;
|
||||
bool chkWaitSend72HourNoWaybillIsChecked = false, chkWaitSend48HourNoWaybillIsChecked = false;
|
||||
bool chkDirectSendFailedIsChecked = false;
|
||||
bool chkNoMapProdIsChecked = false, chkMapProdIsChecked = false, chkMapSkuIsChecked = false;
|
||||
public string OrderTimeFilterType { get; set; } = "更新时间";
|
||||
public bool IsEndDate { get; set; } = false;
|
||||
DateTime _dateStart;
|
||||
public DateTime DateStart
|
||||
{
|
||||
get { return _dateStart; }
|
||||
set
|
||||
{
|
||||
if (_dateStart != value)
|
||||
_dateStart = value;
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("DateStart"));
|
||||
}
|
||||
}
|
||||
DateTime _dateEnd;
|
||||
public DateTime DateEnd
|
||||
{
|
||||
get { return _dateEnd; }
|
||||
set
|
||||
{
|
||||
if (_dateEnd != value)
|
||||
_dateEnd = value;
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("DateEnd"));
|
||||
}
|
||||
}
|
||||
|
||||
string waitBuyTabTxt = "待采购";
|
||||
public string WaitBuyTabTxt
|
||||
{
|
||||
get { return waitBuyTabTxt; }
|
||||
set
|
||||
{
|
||||
if (waitBuyTabTxt != value)
|
||||
{
|
||||
waitBuyTabTxt = value;
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("WaitBuyTabTxt"));
|
||||
}
|
||||
}
|
||||
}
|
||||
string waitSendTabTxt = "待发货";
|
||||
public string WaitSendTabTxt
|
||||
{
|
||||
get { return waitSendTabTxt; }
|
||||
set
|
||||
{
|
||||
if (waitSendTabTxt != value)
|
||||
{
|
||||
waitSendTabTxt = value;
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("waitSendTabTxt"));
|
||||
}
|
||||
}
|
||||
}
|
||||
string waitReceiveTabTxt = "待收货";
|
||||
public string WaitReceiveTabTxt
|
||||
{
|
||||
get { return waitReceiveTabTxt; }
|
||||
set
|
||||
{
|
||||
if (waitReceiveTabTxt != value)
|
||||
{
|
||||
waitReceiveTabTxt = value;
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("WaitReceiveTabTxt"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsAutoReadOrder = true;
|
||||
public DateTime nextGetOrderTime = DateTime.MinValue;
|
||||
|
||||
@@ -217,9 +303,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
// 按过滤条件读取 已废弃
|
||||
//if (filterGetCondition)
|
||||
//{
|
||||
@@ -229,9 +312,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 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())
|
||||
var startTime = BaseClass.DateTimeToTimestampSeconds(DateStart);
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(DateEnd.AddDays(1));
|
||||
if (!IsEndDate)
|
||||
endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(1));
|
||||
// 查询单一订单号订单,不按时间范围搜索
|
||||
if (string.IsNullOrEmpty(orderIds) || orderIds.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList().Count != 1)
|
||||
@@ -239,8 +322,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
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);
|
||||
@@ -356,11 +439,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.PddBuyMap == null)
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (item.PddBuyMap == null)
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.PddBuyMap == null)
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
}
|
||||
item.PddBuyMapSkus = buyMapSkusList.Where(s => s.spu_code == item.out_product_id || s.spu_code == item.product_id).OrderByDescending(s => s.mdy_time)
|
||||
.Where(s => s.platform == "pdd").ToList();
|
||||
@@ -369,11 +452,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var tbBuyMapLst = buyMapList.Where(m => m.platform == "tb").ToList();
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.TbBuyMap == null)
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (item.TbBuyMap == null)
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.TbBuyMap == null)
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
}
|
||||
item.TbBuyMapSkus = buyMapSkusList.Where(s => s.spu_code == item.out_product_id || s.spu_code == item.product_id).OrderByDescending(s => s.mdy_time)
|
||||
.Where(s => s.platform == "tb").ToList();
|
||||
@@ -434,18 +517,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
FilterOneOrder(order);
|
||||
}));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
//Dispatcher.Invoke(new Action(() => { disPlayOrderTabOrderCount(); }));
|
||||
disPlayOrderTabOrderCount();
|
||||
}
|
||||
|
||||
@@ -891,11 +969,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
//{
|
||||
// var buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
|
||||
// if (buyMap != null)
|
||||
// orderItems.Remove(item);
|
||||
@@ -1024,11 +1102,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
// 更新显示
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
InitOrderObservableProp(waybillExceptionOrder);
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(waybillExceptionOrder, true);
|
||||
}));
|
||||
|
||||
var orderId = waybillExceptionOrder.order_id;
|
||||
order_item_ext orderExt = new order_item_ext() { order_id = orderId, shop_app_id = shop.ShopId, shop_name = shop.ShopAccount, abnormal_text = "物流异常" };
|
||||
@@ -1087,18 +1162,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
|
||||
}
|
||||
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderExt.order_id);
|
||||
var order = GlobalConfig.lstOrder.ToList().FirstOrDefault(o => o.order_id == orderExt.order_id);
|
||||
if (order != null)
|
||||
{
|
||||
var orderItem = order.orderItems.FirstOrDefault(oi => oi.sku_id == orderExt.sku_id);
|
||||
var orderItem = order.orderItems.ToList().FirstOrDefault(oi => oi.sku_id == orderExt.sku_id);
|
||||
if (orderItem != null)
|
||||
{
|
||||
orderItem.OrderItemExt = orderExt;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
|
||||
InitOrderObservableProp(order);
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(order, true);
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1134,11 +1207,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
await OrderListRowItemCtrl.PddRefundTransitRejectOrder(orderItem);
|
||||
|
||||
// 赋值显示订单元素
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
InitOrderItemObservableProp(orderItem);
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||
}));
|
||||
|
||||
// 第一个订单多个商品暂不支持,只操作一条记录
|
||||
break;
|
||||
@@ -1224,11 +1294,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新失败,服务端返回 " + msg, "Error", 5);
|
||||
}
|
||||
// 赋值显示订单元素
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
InitOrderItemObservableProp(orderItem);
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1394,11 +1461,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
// 赋值显示订单元素
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
InitOrderItemObservableProp(orderItem);
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||
}));
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1413,56 +1477,64 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
TabItem tabItem = null;
|
||||
List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); }));
|
||||
if (tabItem != null)
|
||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); }));
|
||||
//if (tabItem != null)
|
||||
{
|
||||
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待采购(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待采购(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
WaitBuyTabTxt = "待采购(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货")); }));
|
||||
if (tabItem != null)
|
||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货")); }));
|
||||
//if (tabItem != null)
|
||||
{
|
||||
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待发货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待发货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
WaitSendTabTxt = "待发货(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货")); }));
|
||||
if (tabItem != null)
|
||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货")); }));
|
||||
//if (tabItem != null)
|
||||
{
|
||||
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待收货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待收货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("售后完成单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + userOrderLst.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("需处理售后单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常需重拍")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常需重拍(" + userOrderLst.Where(r => r.IsAbnormal).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + userOrderLst.Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
//txtMsg.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
|
||||
}
|
||||
@@ -1490,11 +1562,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
else
|
||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time).ToList();
|
||||
|
||||
Task.Run(() => { disPlayOrderTabOrderCount(); });
|
||||
//Task.Run(() => {
|
||||
disPlayOrderTabOrderCount();
|
||||
//});
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
//GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(orderLstTmp);
|
||||
//this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
GlobalConfig.lstFilterOrder.Clear();
|
||||
}));
|
||||
foreach (var order in orderLstTmp)
|
||||
@@ -1502,9 +1574,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (token.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
if (!GlobalConfig.lstFilterOrder.Any(o => o.order_id == order.order_id))
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}));
|
||||
}
|
||||
@@ -1517,7 +1589,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
public void FilterOneOrder(string orderId, bool updateTabCount = false)
|
||||
{
|
||||
var orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == orderId);
|
||||
var orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == orderId);
|
||||
FilterOneOrder(orderExist, updateTabCount);
|
||||
}
|
||||
|
||||
@@ -1526,23 +1598,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (order == null)
|
||||
return;
|
||||
|
||||
var orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
var orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
while (orderExist != null)
|
||||
{
|
||||
Dispatcher.Invoke(() =>
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(orderExist);
|
||||
orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
});
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
|
||||
if (!GetOrderIsFilter(order))
|
||||
{
|
||||
oms_wei_order_info nextOrder = null;
|
||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time);
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.update_time < order.update_time);
|
||||
else
|
||||
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
|
||||
|
||||
Dispatcher.Invoke(() =>
|
||||
{
|
||||
if (nextOrder != null)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Insert(GlobalConfig.lstFilterOrder.IndexOf(nextOrder), order);
|
||||
@@ -1551,13 +1628,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (updateTabCount)
|
||||
{
|
||||
//Dispatcher.Invoke(new Action(() =>
|
||||
//{
|
||||
//}));
|
||||
disPlayOrderTabOrderCount();
|
||||
}
|
||||
}
|
||||
@@ -1669,56 +1744,42 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
}
|
||||
|
||||
var filterTimeRst = false;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
// 过滤时间范围
|
||||
if (cmbTimeType.SelectedItem is ComboBoxItem cbi)
|
||||
if (OrderTimeFilterType == "更新时间")
|
||||
{
|
||||
if (cbi.Content is TextBlock tb)
|
||||
if (order.UpdateDateTime < DateStart)
|
||||
{
|
||||
if (tb.Text == "更新时间")
|
||||
{
|
||||
if (order.UpdateDateTime < dateStart.SelectedDate.Value)
|
||||
{
|
||||
filterTimeRst = true;
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
if (chkEndDate.IsChecked == true && order.UpdateDateTime > dateEnd.SelectedDate.Value.AddDays(1))
|
||||
if (IsEndDate == true && order.UpdateDateTime > DateEnd.AddDays(1))
|
||||
{
|
||||
filterTimeRst = true;
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (tb.Text == "成交时间")
|
||||
else if (OrderTimeFilterType == "成交时间")
|
||||
{
|
||||
if (order.CreateDateTime < dateStart.SelectedDate.Value)
|
||||
if (order.CreateDateTime < DateStart)
|
||||
{
|
||||
filterTimeRst = true;
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
if (chkEndDate.IsChecked == true && order.CreateDateTime > dateEnd.SelectedDate.Value.AddDays(1))
|
||||
else if (IsEndDate == true && order.CreateDateTime > DateEnd.AddDays(1))
|
||||
{
|
||||
filterTimeRst = true;
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}));
|
||||
if (filterTimeRst)
|
||||
return filterTimeRst;
|
||||
}
|
||||
|
||||
var filterHeadStrRst = false;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
filterHeadStrRst = FilterTabPage(order, filterHeadStr);
|
||||
}));
|
||||
if (filterHeadStrRst)
|
||||
return filterHeadStrRst;
|
||||
//var filterHeadStrRst = false;
|
||||
//Dispatcher.Invoke(new Action(() =>
|
||||
//{
|
||||
// filterHeadStrRst = FilterTabPage(order, filterHeadStr);
|
||||
//}));
|
||||
//if (filterHeadStrRst)
|
||||
// return filterHeadStrRst;
|
||||
|
||||
return false;
|
||||
//return false;
|
||||
|
||||
return FilterTabPage(order, filterHeadStr);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1729,11 +1790,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
/// <returns></returns>
|
||||
private bool FilterTabPage(oms_wei_order_info order, string filterHeadStr)
|
||||
{
|
||||
if (order.order_id == "3738687160199289344")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// 过滤标签页
|
||||
if (filterHeadStr.IsNullOrEmpty())
|
||||
filterHeadStr = GlobalConfig.OrderTabHeaderStr;
|
||||
@@ -1750,11 +1806,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
if (!order.IsWaitBuy)
|
||||
return true;
|
||||
if (chkMapSku.IsChecked == true && order.orderItems.Any(oi => oi.PddBuyMap == null))
|
||||
if (chkMapSkuIsChecked == true && order.orderItems.Any(oi => oi.PddBuyMap == null))
|
||||
return true;
|
||||
if (chkMapProd.IsChecked == true && order.orderItems.All(oi => oi.PddBuyMapSkus == null || oi.PddBuyMapSkus.Count == 0 || oi.PddBuyMap != null))
|
||||
if (chkMapProdIsChecked == true && order.orderItems.All(oi => oi.PddBuyMapSkus == null || oi.PddBuyMapSkus.Count == 0 || oi.PddBuyMap != null))
|
||||
return true;
|
||||
if (chkNoMapProd.IsChecked == true && (order.orderItems.All(oi => oi.PddBuyMap != null) || order.orderItems.All(oi => oi.PddBuyMapSkus != null && oi.PddBuyMapSkus.Count > 0)))
|
||||
if (chkNoMapProdIsChecked == true && (order.orderItems.All(oi => oi.PddBuyMap != null) || order.orderItems.All(oi => oi.PddBuyMapSkus != null && oi.PddBuyMapSkus.Count > 0)))
|
||||
return true;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("待发货"))
|
||||
@@ -1763,14 +1819,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
|
||||
// 直拍发货失败
|
||||
if (chkDirectSendFailed.IsChecked == true)
|
||||
if (chkDirectSendFailedIsChecked == true)
|
||||
{
|
||||
var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
|
||||
if (!rst2)
|
||||
return true;
|
||||
}
|
||||
|
||||
if (chkWaitSend72HourNoWaybill.IsChecked == true)
|
||||
if (chkWaitSend72HourNoWaybillIsChecked == true)
|
||||
{
|
||||
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
||||
@@ -1783,7 +1839,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
else
|
||||
return true;
|
||||
}
|
||||
else if (chkWaitSend48HourNoWaybill.IsChecked == true)
|
||||
else if (chkWaitSend48HourNoWaybillIsChecked == true)
|
||||
{
|
||||
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||
(bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) &&
|
||||
@@ -1805,7 +1861,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
|
||||
// 需核对物流
|
||||
if (chkNeedCheckExpress.IsChecked == true)
|
||||
if (chkNeedCheckExpressIsChecked == true)
|
||||
{
|
||||
var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功"));
|
||||
var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
|
||||
@@ -1813,26 +1869,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
}
|
||||
|
||||
if (chkWaitReceiveBuyerIsNotSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货"))
|
||||
if (chkWaitReceiveBuyerIsNotSendIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货"))
|
||||
return true;
|
||||
if (chkWaitReceiveBuyerIsSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货"))
|
||||
if (chkWaitReceiveBuyerIsSendIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货"))
|
||||
return true;
|
||||
if (chkWaitReceiveBuyerIsInWarehouse.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已送达"))
|
||||
if (chkWaitReceiveBuyerIsInWarehouseIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已送达"))
|
||||
return true;
|
||||
|
||||
if (chkWaitReceiveWarehouseIsNotPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号"))
|
||||
if (chkWaitReceiveWarehouseIsNotPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号"))
|
||||
return true;
|
||||
if (chkWaitReceiveWarehouseIsPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && oi.WarehouseWaybillStatusStr != "中转已入库"))
|
||||
if (chkWaitReceiveWarehouseIsPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && oi.WarehouseWaybillStatusStr != "中转已入库"))
|
||||
return true;
|
||||
if (chkWaitReceiveWarehouseIsSendOut.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库"))
|
||||
if (chkWaitReceiveWarehouseIsSendOutIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库"))
|
||||
return true;
|
||||
|
||||
if (chk72HourNoWaybill.IsChecked == true)
|
||||
if (chk72HourNoWaybillIsChecked == true)
|
||||
{
|
||||
if (order.order_id == "3739190405314033408")
|
||||
{
|
||||
|
||||
}
|
||||
// 直发没有单号才判断中转仓总店是否超时发货
|
||||
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||
(bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))
|
||||
@@ -1844,7 +1896,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
else
|
||||
return true;
|
||||
}
|
||||
else if (chk48HourNoWaybill.IsChecked == true)
|
||||
else if (chk48HourNoWaybillIsChecked == true)
|
||||
{
|
||||
// 直发没有单号才判断中转仓总店是否超时发货
|
||||
if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder &&
|
||||
@@ -1869,8 +1921,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!order.IsEmergencyManualReturnOrder)
|
||||
return true;
|
||||
|
||||
//"System.Windows.Controls.ComboBoxItem: 未申请";
|
||||
var cmbRejectStatusText = cmbRejectStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
if (cmbRejectStatusText == "未申请" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "未申请"))
|
||||
return true;
|
||||
if (cmbRejectStatusText == "申请中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "已申请拒收"))
|
||||
@@ -1886,7 +1936,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
|
||||
}
|
||||
var cmbReturnPackageStatusText = cmbReturnPackageStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
if (cmbReturnPackageStatusText == "未拦截" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "未添加"))
|
||||
return true;
|
||||
if (cmbReturnPackageStatusText == "拦截中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "已添加"))
|
||||
@@ -1897,45 +1946,45 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
|
||||
|
||||
if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||
if (chkEmergencyBuyerWaitAfterSaleIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||
return true;
|
||||
else if (chkEmergencyBuyerWaitSendBack.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
|
||||
else if (chkEmergencyBuyerWaitSendBackIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
|
||||
return true;
|
||||
else if (chkEmergencyBuyerWaitSupplierRefund.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中")))
|
||||
else if (chkEmergencyBuyerWaitSupplierRefundIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中")))
|
||||
return true;
|
||||
else if (chkEmergencyBuyerRefundFail.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败")))
|
||||
else if (chkEmergencyBuyerRefundFailIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败")))
|
||||
return true;
|
||||
|
||||
if (chkEmergencyShopCustomRefundHasWaybill.IsChecked == true && order.orderItems.Any(oi => oi.ReturnWaybillIdStr.IsNullOrEmpty()))
|
||||
if (chkEmergencyShopCustomRefundHasWaybillIsChecked == true && order.orderItems.Any(oi => oi.ReturnWaybillIdStr.IsNullOrEmpty()))
|
||||
return true;
|
||||
else if (chkEmergencyShopCustomRefundNoWaybill.IsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty()))
|
||||
else if (chkEmergencyShopCustomRefundNoWaybillIsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty()))
|
||||
return true;
|
||||
|
||||
//// 退货仓
|
||||
//if (chkReturnOrderAddress.IsChecked == 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;
|
||||
//// 非退货仓
|
||||
//else if (chkNotReturnOrderAddress.IsChecked == 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;
|
||||
|
||||
// 商家受理中
|
||||
if (chkEmergencyWaitSupplierAccept.IsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "商家受理中"))
|
||||
if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "商家受理中"))
|
||||
return true;
|
||||
// 待商家收货
|
||||
if (chkEmergencyWaitSupplierReceive.IsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "待商家收货"))
|
||||
if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "待商家收货"))
|
||||
return true;
|
||||
// 退款完成(但买手没退)
|
||||
if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
||||
if (chkEmergencyShopAfterSaleSuccessIsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
||||
return true;
|
||||
// 退款中
|
||||
else if (chkEmergencyShopInAfterSale.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
|
||||
else if (chkEmergencyShopInAfterSaleIsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
|
||||
return true;
|
||||
|
||||
// 退货退款
|
||||
if (chkEmergencyReturn.IsChecked == 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;
|
||||
// 仅退款
|
||||
else if (chkEmergencyRefund.IsChecked == 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;
|
||||
}
|
||||
if (filterHeadStr.StartsWith("退货仓自动售后单"))
|
||||
@@ -1943,14 +1992,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!order.IsEmergencyDistribReturnOrder)
|
||||
return true;
|
||||
// 退款完成(但买手没退)
|
||||
if (chkShopIsRefund.IsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
||||
if (chkShopIsRefundIsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
||||
return true;
|
||||
// 退款中
|
||||
else if (chkShopIsNotRefund.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
|
||||
else if (chkShopIsNotRefundIsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
|
||||
return true;
|
||||
|
||||
// 地址解析失败
|
||||
if (chkUpShopAddressAnalyseFailed.IsChecked == true)
|
||||
if (chkUpShopAddressAnalyseFailedIsChecked == true)
|
||||
{
|
||||
if (order.OrderBuyType == "云仓")
|
||||
{
|
||||
@@ -1978,7 +2027,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
|
||||
var cmbReturnOrderStatusText = cmbReturnOrderStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
if (cmbReturnOrderStatusText == "未创建" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "未创建"))
|
||||
return true;
|
||||
if (cmbReturnOrderStatusText == "创建失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "创建失败"))
|
||||
@@ -1990,8 +2038,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (cmbReturnOrderStatusText == "已发回" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已发回")))
|
||||
return true;
|
||||
|
||||
var cmbReturnOrderBuyerStatusText = cmbReturnOrderBuyerStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
|
||||
if (cmbReturnOrderBuyerStatusText == "买手待申请售后" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||
return true;
|
||||
else if (cmbReturnOrderBuyerStatusText == "买手待退货" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
|
||||
@@ -2006,16 +2052,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!order.IsRefund)
|
||||
return true;
|
||||
|
||||
if (chkAftersaleIsSend.IsChecked == true && !order.DeliveryDeadlineStr.Contains("已发货"))
|
||||
if (chkAftersaleIsSendIsChecked == true && !order.DeliveryDeadlineStr.Contains("已发货"))
|
||||
return true;
|
||||
else if (chkAftersaleIsNotSend.IsChecked == true && !order.DeliveryDeadlineStr.Contains("未发货"))
|
||||
else if (chkAftersaleIsNotSendIsChecked == true && !order.DeliveryDeadlineStr.Contains("未发货"))
|
||||
return true;
|
||||
|
||||
if (chkAftersaleBuyerIsBuy.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr.IsNullOrEmpty()))
|
||||
if (chkAftersaleBuyerIsBuyIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr.IsNullOrEmpty()))
|
||||
return true;
|
||||
if (chkAftersaleWarehouseIsNotPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号" && !oi.WarehouseWaybillStatusStr.Contains("取号异常")))
|
||||
if (chkAftersaleWarehouseIsNotPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号" && !oi.WarehouseWaybillStatusStr.Contains("取号异常")))
|
||||
return true;
|
||||
if (chkAftersaleWarehouseIsPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" &&
|
||||
if (chkAftersaleWarehouseIsPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" &&
|
||||
oi.WarehouseWaybillStatusStr != "中转已入库" && oi.WarehouseWaybillStatusStr != "中转已出库"))
|
||||
return true;
|
||||
}
|
||||
@@ -2061,6 +2107,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private async void btnFilter_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
CheckVirtualizationStatus(this.lbxOrder);
|
||||
|
||||
if (orderFilterConfig.lstFilterOrderIds.Count == 1 && !GlobalConfig.lstOrder.Any(o => o.order_id == orderFilterConfig.lstFilterOrderIds.FirstOrDefault()))
|
||||
{
|
||||
await Task.Run(() => { this.GetOrder(orderFilterConfig.lstFilterOrderIds.FirstOrDefault()); });
|
||||
@@ -2072,8 +2120,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
}
|
||||
|
||||
private void dgOrderHeader_LayoutUpdated(object sender, EventArgs e)
|
||||
private async void dgOrderHeader_LayoutUpdated(object sender, EventArgs e)
|
||||
{
|
||||
//await Task.Run(() => { });
|
||||
|
||||
foreach (var item in lbxOrder.Items)
|
||||
{
|
||||
ListBoxItem container = (ListBoxItem)lbxOrder.ItemContainerGenerator.ContainerFromIndex(lbxOrder.Items.IndexOf(item));
|
||||
@@ -2152,6 +2202,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkNoMapProd.IsChecked = chkMapProd.IsChecked = chkMapSku.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
chkNoMapProdIsChecked = chkNoMapProd.IsChecked.ParseToBool();
|
||||
chkMapProdIsChecked = chkMapProd.IsChecked.ParseToBool();
|
||||
chkMapSkuIsChecked = chkMapSku.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2206,6 +2259,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkEmergencyBuyerWaitAfterSale.IsChecked = chkEmergencyBuyerWaitSendBack.IsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked = chkEmergencyBuyerRefundFail.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkEmergencyBuyerWaitAfterSaleIsChecked = chkEmergencyBuyerWaitAfterSale.IsChecked.ParseToBool();
|
||||
chkEmergencyBuyerWaitSendBackIsChecked = chkEmergencyBuyerWaitSendBack.IsChecked.ParseToBool();
|
||||
chkEmergencyBuyerWaitSupplierRefundIsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked.ParseToBool();
|
||||
chkEmergencyBuyerRefundFailIsChecked = chkEmergencyBuyerRefundFail.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2219,6 +2277,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkEmergencyShopCustomRefundHasWaybill.IsChecked = chkEmergencyShopCustomRefundNoWaybill.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkEmergencyShopCustomRefundHasWaybillIsChecked = chkEmergencyShopCustomRefundHasWaybill.IsChecked.ParseToBool();
|
||||
chkEmergencyShopCustomRefundNoWaybillIsChecked = chkEmergencyShopCustomRefundNoWaybill.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2234,6 +2295,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkEmergencyWaitSupplierReceive.IsChecked = chkEmergencyWaitSupplierAccept.IsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkEmergencyWaitSupplierReceiveIsChecked = chkEmergencyWaitSupplierReceive.IsChecked.ParseToBool();
|
||||
chkEmergencyWaitSupplierAcceptIsChecked = chkEmergencyWaitSupplierAccept.IsChecked.ParseToBool();
|
||||
chkEmergencyShopAfterSaleSuccessIsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked.ParseToBool();
|
||||
chkEmergencyShopInAfterSaleIsChecked = chkEmergencyShopInAfterSale.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2250,6 +2316,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkWaitReceiveBuyerIsSend.IsChecked = chkWaitReceiveBuyerIsNotSend.IsChecked = chkWaitReceiveBuyerIsInWarehouse.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkWaitReceiveBuyerIsSendIsChecked = chkWaitReceiveBuyerIsSend.IsChecked.ParseToBool();
|
||||
chkWaitReceiveBuyerIsNotSendIsChecked = chkWaitReceiveBuyerIsNotSend.IsChecked.ParseToBool();
|
||||
chkWaitReceiveBuyerIsInWarehouseIsChecked = chkWaitReceiveBuyerIsInWarehouse.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2261,6 +2331,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkWaitReceiveWarehouseIsNotPickup.IsChecked = chkWaitReceiveWarehouseIsPickup.IsChecked = chkWaitReceiveWarehouseIsSendOut.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkWaitReceiveWarehouseIsNotPickupIsChecked = chkWaitReceiveWarehouseIsNotPickup.IsChecked.ParseToBool();
|
||||
chkWaitReceiveWarehouseIsPickupIsChecked = chkWaitReceiveWarehouseIsPickup.IsChecked.ParseToBool();
|
||||
chkWaitReceiveWarehouseIsSendOutIsChecked = chkWaitReceiveWarehouseIsSendOut.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2272,6 +2346,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkAftersaleIsSend.IsChecked = chkAftersaleIsNotSend.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkAftersaleIsSendIsChecked = chkAftersaleIsSend.IsChecked.ParseToBool();
|
||||
chkAftersaleIsNotSendIsChecked = chkAftersaleIsNotSend.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2283,6 +2360,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkAftersaleBuyerIsBuy.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkAftersaleBuyerIsBuyIsChecked = chkAftersaleBuyerIsBuy.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2294,6 +2373,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkAftersaleWarehouseIsPickup.IsChecked = chkAftersaleWarehouseIsNotPickup.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkAftersaleWarehouseIsPickupIsChecked = chkAftersaleWarehouseIsPickup.IsChecked.ParseToBool();
|
||||
chkAftersaleWarehouseIsNotPickupIsChecked = chkAftersaleWarehouseIsNotPickup.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2829,6 +2911,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkEmergencyReturn.IsChecked = chkEmergencyRefund.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkEmergencyReturnIsChecked = chkEmergencyReturn.IsChecked.ParseToBool();
|
||||
chkEmergencyRefundIsChecked = chkEmergencyRefund.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -2997,8 +3082,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private void cmbRejectOrReturnStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (this.IsLoaded)
|
||||
{
|
||||
//"System.Windows.Controls.ComboBoxItem: 未申请";
|
||||
this.cmbRejectStatusText = cmbRejectStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
this.cmbReturnPackageStatusText = cmbReturnPackageStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
|
||||
private void chkNeedCheckExpress_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
@@ -3007,6 +3098,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkNeedCheckExpress.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
chkNeedCheckExpressIsChecked = chkNeedCheckExpress.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -3018,6 +3110,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkShopIsRefund.IsChecked = chkShopIsNotRefund.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkShopIsRefundIsChecked = chkShopIsRefund.IsChecked.ParseToBool();
|
||||
chkShopIsNotRefundIsChecked = chkShopIsNotRefund.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -3029,6 +3124,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkDirectSendFailed.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
chkDirectSendFailedIsChecked = chkDirectSendFailed.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -3040,6 +3136,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkUpShopAddressAnalyseFailed.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chkUpShopAddressAnalyseFailedIsChecked = chkUpShopAddressAnalyseFailed.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -3082,6 +3180,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chk48HourNoWaybill.IsChecked = chk72HourNoWaybill.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
|
||||
chk48HourNoWaybillIsChecked = chk48HourNoWaybill.IsChecked.ParseToBool();
|
||||
chk72HourNoWaybillIsChecked = chk72HourNoWaybill.IsChecked.ParseToBool();
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
@@ -3093,19 +3194,29 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkWaitSend48HourNoWaybill.IsChecked = chkWaitSend72HourNoWaybill.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
chkWaitSend48HourNoWaybillIsChecked = chkWaitSend48HourNoWaybill.IsChecked.Value;
|
||||
chkWaitSend72HourNoWaybillIsChecked = chkWaitSend72HourNoWaybill.IsChecked.Value;
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void cmbReturnOrderStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (this.IsLoaded)
|
||||
{
|
||||
cmbReturnOrderStatusText = cmbReturnOrderStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbReturnOrderBuyerStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (this.IsLoaded)
|
||||
{
|
||||
cmbReturnOrderBuyerStatusText = cmbReturnOrderBuyerStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
|
||||
private void chkSyncDirectOrderWaybill_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
@@ -3147,6 +3258,47 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
private void cmbTimeType_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (cmbTimeType.SelectedItem is ComboBoxItem cbi)
|
||||
{
|
||||
if (cbi.Content is TextBlock tb)
|
||||
{
|
||||
OrderTimeFilterType = tb.Text;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void chkEndDate_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
IsEndDate = chkEndDate.IsChecked.ParseToBool();
|
||||
}
|
||||
|
||||
|
||||
// 假设 listBox 是你的列表控件
|
||||
private void CheckVirtualizationStatus(ListBox listBox)
|
||||
{
|
||||
// 获取 ItemsPresenter 或直接获取 Panel
|
||||
var itemsPresenter = VisualTreeHelper.GetChild(listBox, 0) as ItemsPresenter;
|
||||
if (itemsPresenter != null)
|
||||
{
|
||||
var panel = VisualTreeHelper.GetChild(itemsPresenter, 0) as VirtualizingStackPanel;
|
||||
if (panel != null)
|
||||
{
|
||||
// 关键指标:子元素数量应远小于 ItemsSource.Count
|
||||
int visibleItemCount = panel.Children.Count;
|
||||
int totalDataCount = listBox.Items.Count;
|
||||
System.Diagnostics.Debug.WriteLine($"总数据: {totalDataCount}, 当前UI容器数: {visibleItemCount}");
|
||||
|
||||
// 如果 visibleItemCount 接近 totalDataCount,说明虚拟化未生效或已失效
|
||||
bool isEffectivelyVirtualizing = visibleItemCount < totalDataCount / 2;
|
||||
// 也可以通过附加属性API检查配置状态(注意:这仅检查配置值,不保证运行时行为)
|
||||
bool configValue = VirtualizingStackPanel.GetIsVirtualizing(listBox);
|
||||
System.Diagnostics.Debug.WriteLine($"配置值 IsVirtualizing: {configValue}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class OrderFilterConfig : PropertyNotifyObject
|
||||
|
||||
@@ -45,6 +45,14 @@
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="6" />
|
||||
</Grid.RowDefinitions>
|
||||
<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<!--<TextBlock Text="{Binding ProductName}" Margin="20,0,0,0"/>-->
|
||||
<local:OrderListRowItemCtrl DataContext="{Binding}" />
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
||||
@@ -41,20 +41,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private async void OrderListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_info order)
|
||||
{
|
||||
int index = 0;
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
|
||||
index++;
|
||||
var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
|
||||
Grid.SetRow(rowItem, index);
|
||||
this.gridChildOrder.Children.Add(rowItem);
|
||||
if (index >= 5)
|
||||
break;
|
||||
}
|
||||
}
|
||||
//await Task.Run(() => { });
|
||||
//
|
||||
//if (this.DataContext is oms_wei_order_info order)
|
||||
//{
|
||||
// int index = 0;
|
||||
// foreach (var orderItem in order.orderItems)
|
||||
// {
|
||||
// gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
|
||||
// index++;
|
||||
// var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
|
||||
// Grid.SetRow(rowItem, index);
|
||||
// this.gridChildOrder.Children.Add(rowItem);
|
||||
// if (index >= 5)
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
}
|
||||
|
||||
private void CheckBox_Click(object sender, RoutedEventArgs e)
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding sku_attr_str}"
|
||||
Text="{Binding SkuAttrStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="规格" />
|
||||
</wpf:TitleContent>
|
||||
@@ -298,7 +298,7 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding predict_commission_fee_str}"
|
||||
Text="{Binding PredictCommissionFeeStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="平台服务费" />
|
||||
</wpf:TitleContent>
|
||||
@@ -308,7 +308,7 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding commission_amount_str}"
|
||||
Text="{Binding CommissionAmountStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="达人佣金" />
|
||||
</wpf:TitleContent>
|
||||
@@ -318,7 +318,7 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding out_amount_str}"
|
||||
Text="{Binding OutAmountStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="外采金额" />
|
||||
</wpf:TitleContent>
|
||||
|
||||
@@ -1960,7 +1960,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
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.txtSkuName.Text = orderItem.SkuAttrStr; // 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(); // 当前库存;
|
||||
|
||||
@@ -74,7 +74,7 @@ public class BuyMapSkuViewModel : PropertyNotifyObject
|
||||
if (orderItem != null)
|
||||
{
|
||||
this.ShopGoodsName = orderItem.title;
|
||||
this.ShopSkuName = orderItem.sku_attr_str;
|
||||
this.ShopSkuName = orderItem.SkuAttrStr;
|
||||
this.ShopSkuPrice = (orderItem.real_price * 0.01m).ParseToString();
|
||||
}
|
||||
if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||
@@ -163,7 +163,7 @@ public class BuyMapSkuViewModel : PropertyNotifyObject
|
||||
}
|
||||
|
||||
var spuCode = OrderItem.out_product_id.IsNullOrEmpty() ? OrderItem.product_id : OrderItem.out_product_id;
|
||||
var skuCode = OrderItem.out_sku_id.IsNullOrEmpty() ? OrderItem.sku_attr_str : OrderItem.out_sku_id;
|
||||
var skuCode = OrderItem.out_sku_id.IsNullOrEmpty() ? OrderItem.SkuAttrStr : OrderItem.out_sku_id;
|
||||
if (spuCode.IsNullOrEmpty())
|
||||
spuCode = OrderItem.product_id;
|
||||
if (await SaveSkuMap(spuCode, skuCode, mapGoodsName, mapSkuName, mapGoodsId, mapSkuId, transitWarehouse, sendProvince, platform))
|
||||
@@ -239,9 +239,9 @@ public class BuyMapSkuViewModel : PropertyNotifyObject
|
||||
foreach (var item in order.orderItems)
|
||||
{
|
||||
if ((item.out_product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||
(item.out_product_id == map.spu_code && item.sku_attr_str == map.sku_code) ||
|
||||
(item.out_product_id == map.spu_code && item.SkuAttrStr == map.sku_code) ||
|
||||
(item.product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||
(item.product_id == map.spu_code && item.sku_attr_str == map.sku_code))
|
||||
(item.product_id == map.spu_code && item.SkuAttrStr == map.sku_code))
|
||||
{
|
||||
item.PddBuyMap = map;
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
txtShopName.Text = OrderItem.ItemOrder?.shop_name;
|
||||
txtGoodsName.Text = OrderItem.title;
|
||||
txtSpuId.Text = OrderItem.product_id.ParseToString();
|
||||
txtSpecName.Text = OrderItem.sku_attr_str;
|
||||
txtSpecName.Text = OrderItem.SkuAttrStr;
|
||||
|
||||
txtWaybillId.Text = OrderItem.ItemRefund?.return_waybill_id;
|
||||
foreach (var cmbItem in cmbExpressName.Items)
|
||||
@@ -191,7 +191,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
|
||||
jItemObj["spuName"] = OrderItem.title;
|
||||
jItemObj["skuCode"] = OrderItem.sku_id.ParseToString();
|
||||
jItemObj["specInfo"] = OrderItem.sku_attr_str;
|
||||
jItemObj["specInfo"] = OrderItem.SkuAttrStr;
|
||||
jItemObj["skuUrl"] = OrderItem.thumb_img;
|
||||
jItemObj["picUrl"] = OrderItem.thumb_img;
|
||||
jItemObj["returnQuantity"] = OrderItem.sku_cnt;
|
||||
@@ -317,7 +317,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
|
||||
jItemObj["spuName"] = OrderItem.title;
|
||||
jItemObj["skuCode"] = OrderItem.sku_id.ParseToString();
|
||||
jItemObj["specInfo"] = OrderItem.sku_attr_str;
|
||||
jItemObj["specInfo"] = OrderItem.SkuAttrStr;
|
||||
jItemObj["skuUrl"] = OrderItem.thumb_img;
|
||||
jItemObj["picUrl"] = OrderItem.thumb_img;
|
||||
jItemObj["returnQuantity"] = OrderItem.sku_cnt;
|
||||
|
||||
@@ -54,10 +54,7 @@ namespace AllBase.Model.DBModel
|
||||
public List<WXBuyMapSkusInfo> PddBuyMapSkus
|
||||
{
|
||||
get { return this.GetValue(x => x.PddBuyMapSkus); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.PddBuyMapSkus, value);
|
||||
}
|
||||
set { this.SetValue(x => x.PddBuyMapSkus, value); }
|
||||
}
|
||||
|
||||
public List<WXBuyMapSkusInfo> TbBuyMapSkus
|
||||
@@ -300,13 +297,12 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
public void SetTransitOrder()
|
||||
{
|
||||
|
||||
if (order_id == "3739241588056569856")
|
||||
{
|
||||
|
||||
}
|
||||
this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
|
||||
this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
|
||||
this.SetTransitRefundStatusStr();
|
||||
|
||||
this.ItemTransitExtraOrder = ItemTransitExtraOrders?.FirstOrDefault(t => t.order_void_status != 1) ?? ItemTransitExtraOrders.FirstOrDefault();
|
||||
|
||||
@@ -739,99 +735,93 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string TransitRefundStatusStr
|
||||
{
|
||||
get
|
||||
{
|
||||
if (order_id == "3738453024420550400")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status))
|
||||
{
|
||||
// 店铺售后又取消的,如果是买手还没申请售后,不显示需手动申请售后文字
|
||||
if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
|
||||
return "";
|
||||
|
||||
// 显示售后金额(如果有)
|
||||
if (ItemTransitOrderWithVoid.refund_status.EndsWith("买手退款成功"))
|
||||
{
|
||||
if (PddBuyerAfterSale?.refundAmount != null)
|
||||
return ItemTransitOrderWithVoid.refund_status + "(¥" + PddBuyerAfterSale.refundAmount * 0.01m + ")";
|
||||
else
|
||||
return ItemTransitOrderWithVoid.refund_status + "(退款金额待获取)";
|
||||
}
|
||||
|
||||
if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && !ItemTransitOrderWithVoid.refund_status.Contains("已超过可申请售后的时间"))
|
||||
return "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到,", "");
|
||||
|
||||
if (order_id == "3737761985909113600")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
return ItemTransitOrderWithVoid.refund_status;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.TransitRefundStatusStr); }
|
||||
set { this.SetValue(x => x.TransitRefundStatusStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 中转仓表买手售后字段文字显示背景颜色
|
||||
/// </summary>
|
||||
public SolidColorBrush TransitRefundStatusBackColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
return GlobalConfig.GreenBrush;
|
||||
if (TransitRefundStatusStr.Contains("需手动申请售后") || TransitRefundStatusStr.Contains("已超过可申请售后的时间") || TransitRefundStatusStr.Contains("退款失败"))
|
||||
return GlobalConfig.RedBrush;
|
||||
return GlobalConfig.LightOrangeBrush;
|
||||
//return YellowBrush;
|
||||
}
|
||||
set
|
||||
{
|
||||
}
|
||||
get { return this.GetValue(x => x.TransitRefundStatusBackColor); }
|
||||
set { this.SetValue(x => x.TransitRefundStatusBackColor, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 中转仓作废参数
|
||||
/// </summary>
|
||||
public string TransitRefundVoidStatusStr
|
||||
{
|
||||
get
|
||||
get { return this.GetValue(x => x.TransitRefundVoidStatusStr); }
|
||||
set { this.SetValue(x => x.TransitRefundVoidStatusStr, value); }
|
||||
}
|
||||
public void SetTransitRefundStatusStr()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status))
|
||||
{
|
||||
// 店铺售后又取消的,如果是买手还没申请售后,不显示需手动申请售后文字
|
||||
if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
|
||||
TransitRefundStatusStr = "";
|
||||
|
||||
// 显示售后金额(如果有)
|
||||
else if (ItemTransitOrderWithVoid.refund_status.EndsWith("买手退款成功"))
|
||||
{
|
||||
if (PddBuyerAfterSale?.refundAmount != null)
|
||||
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status + "(¥" + PddBuyerAfterSale.refundAmount * 0.01m + ")";
|
||||
else
|
||||
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status + "(退款金额待获取)";
|
||||
}
|
||||
|
||||
else if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && !ItemTransitOrderWithVoid.refund_status.Contains("已超过可申请售后的时间"))
|
||||
TransitRefundStatusStr = "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到,", "");
|
||||
else
|
||||
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status;
|
||||
}
|
||||
else
|
||||
TransitRefundStatusStr = "";
|
||||
|
||||
|
||||
if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
TransitRefundStatusBackColor = GlobalConfig.GreenBrush;
|
||||
else if (TransitRefundStatusStr.Contains("需手动申请售后") || TransitRefundStatusStr.Contains("已超过可申请售后的时间") || TransitRefundStatusStr.Contains("退款失败"))
|
||||
TransitRefundStatusBackColor = GlobalConfig.RedBrush;
|
||||
else
|
||||
TransitRefundStatusBackColor = GlobalConfig.LightOrangeBrush;
|
||||
|
||||
|
||||
//if (ItemTransitOrderWithVoid?.order_void_status == 2)
|
||||
// return "中转作废失败";
|
||||
if (ItemTransitOrderWithVoid?.order_void_status == 1)
|
||||
return "中转已作废";
|
||||
return "";
|
||||
}
|
||||
set { }
|
||||
TransitRefundVoidStatusStr = "中转已作废";
|
||||
}
|
||||
|
||||
|
||||
// 仓库采购时间是否达标字段
|
||||
public string OutOrderTimeQualifiedStr
|
||||
{
|
||||
get
|
||||
get { return this.GetValue(x => x.OutOrderTimeQualifiedStr); }
|
||||
set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); }
|
||||
}
|
||||
void SetOutOrderTimeQualifiedStr()
|
||||
{
|
||||
if (ItemTransitOrderWithVoid == null)
|
||||
return "";
|
||||
|
||||
OutOrderTimeQualifiedStr = "";
|
||||
else
|
||||
{
|
||||
string timeStr = ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (CreateDateTime.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
|
||||
return timeStr + " ×";
|
||||
return timeStr + " √";
|
||||
OutOrderTimeQualifiedStr = timeStr + " ×";
|
||||
else
|
||||
OutOrderTimeQualifiedStr = timeStr + " √";
|
||||
}
|
||||
set { }
|
||||
OutOrderTimeQualifiedBrush = OutOrderTimeQualifiedStr != null && OutOrderTimeQualifiedStr.EndsWith("√") ? GlobalConfig.GreenTextBrush : GlobalConfig.RedTextBrush;
|
||||
}
|
||||
/// <summary>
|
||||
/// 仓库采购时间是否达标字段颜色
|
||||
/// </summary>
|
||||
public SolidColorBrush OutOrderTimeQualifiedBrush
|
||||
{
|
||||
get
|
||||
{
|
||||
return OutOrderTimeQualifiedStr.EndsWith("√") ? GlobalConfig.GreenTextBrush : GlobalConfig.RedTextBrush;
|
||||
}
|
||||
get { return this.GetValue(x => x.OutOrderTimeQualifiedBrush); }
|
||||
set { this.SetValue(x => x.OutOrderTimeQualifiedBrush, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -839,74 +829,79 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string OrderItemStatusStr
|
||||
{
|
||||
get
|
||||
{
|
||||
if (ItemOrder?.status == 10)
|
||||
return "待付款";
|
||||
if (ItemOrder?.status == 12)
|
||||
return "礼物待收下";
|
||||
if (ItemOrder?.status == 13)
|
||||
return "一起买待成团";
|
||||
if (ItemOrder?.status == 20)
|
||||
return "待店铺发货";
|
||||
if (ItemOrder?.status == 21)
|
||||
return "店铺部分发货";
|
||||
if (ItemOrder?.status == 30)
|
||||
return "待买家收货";
|
||||
if (ItemOrder?.status == 100)
|
||||
return "订单完成";
|
||||
if (ItemOrder?.status == 200)
|
||||
return "售后完成订单取消";
|
||||
if (ItemOrder?.status == 250)
|
||||
return "未付款已取消";
|
||||
return "未知状态";
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.OrderItemStatusStr); }
|
||||
set { this.SetValue(x => x.OrderItemStatusStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 微信订单状态颜色
|
||||
/// </summary>
|
||||
public SolidColorBrush OrderItemStatusStrColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.RedBrush;
|
||||
if ("订单完成".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.GreenBrush;
|
||||
if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.YellowBrush;
|
||||
return GlobalConfig.YellowBrush;
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.OrderItemStatusStrColor); }
|
||||
set { this.SetValue(x => x.OrderItemStatusStrColor, value); }
|
||||
}
|
||||
public SolidColorBrush OrderItemStatusBorderColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.RedBrush75;
|
||||
if ("订单完成".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.GreenBrush75;
|
||||
if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.YellowBrush75;
|
||||
return GlobalConfig.YellowBrush75;
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.OrderItemStatusBorderColor); }
|
||||
set { this.SetValue(x => x.OrderItemStatusBorderColor, value); }
|
||||
}
|
||||
public SolidColorBrush OrderItemStatusBackColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.RedBrush35;
|
||||
if ("订单完成".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.GreenBrush35;
|
||||
if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
|
||||
return GlobalConfig.YellowBrush35;
|
||||
return GlobalConfig.YellowBrush35;
|
||||
get { return this.GetValue(x => x.OrderItemStatusBackColor); }
|
||||
set { this.SetValue(x => x.OrderItemStatusBackColor, value); }
|
||||
}
|
||||
set { }
|
||||
|
||||
void SetOrderItemStatusAndColor()
|
||||
{
|
||||
if (ItemOrder?.status == 10)
|
||||
OrderItemStatusStr = "待付款";
|
||||
else if (ItemOrder?.status == 12)
|
||||
OrderItemStatusStr = "礼物待收下";
|
||||
else if (ItemOrder?.status == 13)
|
||||
OrderItemStatusStr = "一起买待成团";
|
||||
else if (ItemOrder?.status == 20)
|
||||
OrderItemStatusStr = "待店铺发货";
|
||||
else if (ItemOrder?.status == 21)
|
||||
OrderItemStatusStr = "店铺部分发货";
|
||||
else if (ItemOrder?.status == 30)
|
||||
OrderItemStatusStr = "待买家收货";
|
||||
else if (ItemOrder?.status == 100)
|
||||
OrderItemStatusStr = "订单完成";
|
||||
else if (ItemOrder?.status == 200)
|
||||
OrderItemStatusStr = "售后完成订单取消";
|
||||
else if (ItemOrder?.status == 250)
|
||||
OrderItemStatusStr = "未付款已取消";
|
||||
else
|
||||
OrderItemStatusStr = "未知状态";
|
||||
|
||||
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusStrColor = GlobalConfig.RedBrush;
|
||||
else if("订单完成".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusStrColor = GlobalConfig.GreenBrush;
|
||||
else if("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusStrColor = GlobalConfig.YellowBrush;
|
||||
else
|
||||
OrderItemStatusStrColor = GlobalConfig.YellowBrush;
|
||||
|
||||
|
||||
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusBorderColor = GlobalConfig.RedBrush75;
|
||||
else if("订单完成".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusBorderColor = GlobalConfig.GreenBrush75;
|
||||
else if("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusBorderColor = GlobalConfig.YellowBrush75;
|
||||
else
|
||||
OrderItemStatusBorderColor = GlobalConfig.YellowBrush75;
|
||||
|
||||
|
||||
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusBackColor = GlobalConfig.RedBrush35;
|
||||
else if ("订单完成".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusBackColor = GlobalConfig.GreenBrush35;
|
||||
else if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
|
||||
OrderItemStatusBackColor = GlobalConfig.YellowBrush35;
|
||||
else
|
||||
OrderItemStatusBackColor = GlobalConfig.YellowBrush35;
|
||||
}
|
||||
|
||||
public List<distrib_return_order_info> DistribReturnOrderInfos
|
||||
@@ -1048,14 +1043,68 @@ namespace AllBase.Model.DBModel
|
||||
set { this.SetValue(x => x.LatestTransitEWaybill, value); }
|
||||
}
|
||||
|
||||
public void CalcOrderPrice()
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.real_price) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
RealPriceStr = "¥" + (real_price * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
CashCouponDiscountedPriceStr = "¥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.orderItems.Count).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
PurchasePriceStr = "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible;
|
||||
PurchasePriceVisibility = Visibility.Collapsed;
|
||||
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.freight.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
FreightStr = "¥" + (freight * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||
FreightVisibility = Visibility.Collapsed;
|
||||
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
PredictCommissionFeeStr = "¥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.commission_amount.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
CommissionAmountStr = "¥" + (commission_amount.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//get { return "¥" + (ItemOrder.out_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
//if (ItemTransitOrder?.out_amount > 0)
|
||||
// return "¥" + (ItemTransitOrder.out_amount * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
if (ItemTransitOrders.Any(t => t.refund_status != "买手退款成功"))
|
||||
OutAmountStr = "¥" + (ItemTransitOrders.Where(t => t.refund_status != "买手退款成功").Sum(t => t.out_amount) * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
else
|
||||
OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
|
||||
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count;
|
||||
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.orderItems.Count;
|
||||
ProfitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price - purchase_price.ParseToInt() - freight.ParseToInt() -
|
||||
predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
|
||||
|
||||
//get { return "¥" + (profit * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
//get { return "¥" + ((ItemOrder.profit - ItemOrder.out_amount) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
if (refund_status == 2 || refund_status == 3 || refund_status == 4 || refund_status == 11)
|
||||
ProfitCountStr = "--";
|
||||
else
|
||||
ProfitCountStr = "¥" + ProfitCount.ToString("0.00");
|
||||
|
||||
if (refund_status == 2 || refund_status == 3 || refund_status == 4 || refund_status == 11)
|
||||
ProfitStrColor = GlobalConfig.GrayBrush;
|
||||
else
|
||||
ProfitStrColor = ProfitCount > 0 ? GlobalConfig.GreenTextBrush : GlobalConfig.RedTextBrush;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订单中所有商品加起来的总售价文本
|
||||
/// </summary>
|
||||
public string RealPriceStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.real_price) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (real_price * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.RealPriceStr); }
|
||||
set { this.SetValue(x => x.RealPriceStr, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1063,16 +1112,14 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string CashCouponDiscountedPriceStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.CashCouponDiscountedPriceStr); }
|
||||
set { this.SetValue(x => x.CashCouponDiscountedPriceStr, value); }
|
||||
}
|
||||
|
||||
public string PostagePriceStr
|
||||
{
|
||||
|
||||
get { return "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.orderItems.Count).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.PostagePriceStr); }
|
||||
set { this.SetValue(x => x.PostagePriceStr, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1080,21 +1127,16 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string PurchasePriceStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.PurchasePriceStr); }
|
||||
set { this.SetValue(x => x.PurchasePriceStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 采购价文本是否可见
|
||||
/// </summary>
|
||||
public Visibility PurchasePriceVisibility
|
||||
{
|
||||
get
|
||||
{
|
||||
//if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible;
|
||||
return Visibility.Collapsed;
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.PurchasePriceVisibility); }
|
||||
set { this.SetValue(x => x.PurchasePriceVisibility, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1102,83 +1144,52 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string FreightStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.freight.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (freight * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.FreightStr); }
|
||||
set { this.SetValue(x => x.FreightStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 运费文本是否可见
|
||||
/// </summary>
|
||||
public Visibility FreightVisibility
|
||||
{
|
||||
//get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||
get { return Visibility.Collapsed; }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.FreightVisibility); }
|
||||
set { this.SetValue(x => x.FreightVisibility, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 平台服务费
|
||||
/// </summary>
|
||||
public string predict_commission_fee_str
|
||||
public string PredictCommissionFeeStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.PredictCommissionFeeStr); }
|
||||
set { this.SetValue(x => x.PredictCommissionFeeStr, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 达人佣金
|
||||
/// </summary>
|
||||
public string commission_amount_str
|
||||
public string CommissionAmountStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.commission_amount.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (commission_amount.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
set { }
|
||||
get { return this.GetValue(x => x.PredictCommissionFeeStr); }
|
||||
set { this.SetValue(x => x.PredictCommissionFeeStr, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 外采金额文本
|
||||
/// </summary>
|
||||
public string out_amount_str
|
||||
public string OutAmountStr
|
||||
{
|
||||
//get { return "¥" + (ItemOrder.out_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get
|
||||
{
|
||||
//if (ItemTransitOrder?.out_amount > 0)
|
||||
// return "¥" + (ItemTransitOrder.out_amount * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
if (ItemTransitOrders.Any(t => t.refund_status != "买手退款成功"))
|
||||
return "¥" + (ItemTransitOrders.Where(t => t.refund_status != "买手退款成功").Sum(t => t.out_amount) * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
else
|
||||
return "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.OutAmountStr); }
|
||||
set { this.SetValue(x => x.OutAmountStr, value); }
|
||||
}
|
||||
|
||||
|
||||
decimal profitCount = decimal.MinValue;
|
||||
/// <summary>
|
||||
/// 通过计算的利润
|
||||
/// </summary>
|
||||
public decimal ProfitCount
|
||||
{
|
||||
get
|
||||
{
|
||||
if (profitCount == decimal.MinValue)
|
||||
{
|
||||
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
|
||||
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count;
|
||||
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.orderItems.Count;
|
||||
profitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price -
|
||||
purchase_price.ParseToInt() - freight.ParseToInt() - predict_commission_fee.ParseToInt() -
|
||||
commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
|
||||
}
|
||||
return profitCount;
|
||||
}
|
||||
set
|
||||
{
|
||||
profitCount = decimal.MinValue;
|
||||
}
|
||||
get { return this.GetValue(x => x.ProfitCount); }
|
||||
set { this.SetValue(x => x.ProfitCount, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1186,29 +1197,15 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string ProfitCountStr
|
||||
{
|
||||
//get { return "¥" + (profit * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
//get { return "¥" + ((ItemOrder.profit - ItemOrder.out_amount) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get
|
||||
{
|
||||
if (refund_status == 2 || refund_status == 3 || refund_status == 4 || refund_status == 11)
|
||||
return "--";
|
||||
return "¥" + ProfitCount.ToString("0.00");
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.ProfitCountStr); }
|
||||
set { this.SetValue(x => x.ProfitCountStr, value); }
|
||||
}
|
||||
|
||||
public SolidColorBrush ProfitStrColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if (refund_status == 2 || refund_status == 3 || refund_status == 4 || refund_status == 11)
|
||||
return GlobalConfig.GrayBrush;
|
||||
//return ProfitCount > 0 ? new SolidColorBrush(Color.FromRgb(103, 194, 58)) : new SolidColorBrush(Color.FromRgb(250, 71, 51));
|
||||
return ProfitCount > 0 ? GlobalConfig.GreenTextBrush : GlobalConfig.RedTextBrush;
|
||||
get { return this.GetValue(x => x.ProfitStrColor); }
|
||||
set { this.SetValue(x => x.ProfitStrColor, value); }
|
||||
}
|
||||
set { }
|
||||
}
|
||||
|
||||
|
||||
|
||||
public DateTime CreateDateTime
|
||||
{
|
||||
@@ -1235,19 +1232,20 @@ namespace AllBase.Model.DBModel
|
||||
/// <summary>
|
||||
/// sku规格名称文本
|
||||
/// </summary>
|
||||
public string sku_attr_str
|
||||
public string SkuAttrStr
|
||||
{
|
||||
get
|
||||
get { return this.GetValue(x => x.SkuAttrStr); }
|
||||
set { this.SetValue(x => x.SkuAttrStr, value); }
|
||||
}
|
||||
public void SetSkuAttrStr()
|
||||
{
|
||||
try
|
||||
{
|
||||
var jObj = JArray.Parse(sku_attrs);
|
||||
var str = string.Join(",", jObj.Select(j => j["attr_value"].ParseToString()));
|
||||
return str;
|
||||
SkuAttrStr = str;
|
||||
}
|
||||
catch { return "获取失败"; }
|
||||
}
|
||||
set { }
|
||||
catch { SkuAttrStr = "获取失败"; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1491,6 +1489,7 @@ namespace AllBase.Model.DBModel
|
||||
// }));
|
||||
//}
|
||||
|
||||
this.SetSkuAttrStr();
|
||||
this.SetItemRefund();
|
||||
this.SetTransitOrder();
|
||||
this.SetDirectOrder();
|
||||
@@ -1502,6 +1501,9 @@ namespace AllBase.Model.DBModel
|
||||
this.SetAbnormalAndDirectBtnVisibility();
|
||||
|
||||
SetEWaybillInfo();
|
||||
SetOutOrderTimeQualifiedStr();
|
||||
CalcOrderPrice();
|
||||
SetOrderItemStatusAndColor();
|
||||
}
|
||||
|
||||
/// <summary> 初始化物流明细信息 </summary>
|
||||
|
||||
@@ -221,9 +221,9 @@ namespace TemuKJD.ToolForms
|
||||
this.txtShopSkuId.Text = orderItem.sku_id;
|
||||
this.txtShopGoodsId.Text = orderItem.product_id;
|
||||
this.txtSpuCode.Text = orderItem.out_product_id.IsNullOrEmpty() ? orderItem.product_id : orderItem.out_product_id;
|
||||
this.txtSkuCode.Text = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.sku_attr_str : orderItem.out_sku_id;
|
||||
this.txtSkuCode.Text = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.SkuAttrStr : orderItem.out_sku_id;
|
||||
this.txtShopGoodsName.Text = orderItem.title;
|
||||
this.txtShopSpecName.Text = orderItem.sku_attr_str;
|
||||
this.txtShopSpecName.Text = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPrice.Text = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
|
||||
@@ -1226,9 +1226,9 @@ namespace TemuKJD.ToolForms
|
||||
foreach (var item in order.orderItems)
|
||||
{
|
||||
if ((item.out_product_id == pddBuyMap.spu_code && item.out_sku_id == pddBuyMap.sku_code) ||
|
||||
(item.out_product_id == pddBuyMap.spu_code && item.sku_attr_str == pddBuyMap.sku_code) ||
|
||||
(item.out_product_id == pddBuyMap.spu_code && item.SkuAttrStr == pddBuyMap.sku_code) ||
|
||||
(item.product_id == pddBuyMap.spu_code && item.out_sku_id == pddBuyMap.sku_code) ||
|
||||
(item.product_id == pddBuyMap.spu_code && item.sku_attr_str == pddBuyMap.sku_code))
|
||||
(item.product_id == pddBuyMap.spu_code && item.SkuAttrStr == pddBuyMap.sku_code))
|
||||
{
|
||||
item.PddBuyMap = pddBuyMap;
|
||||
|
||||
|
||||
Reference in new issue
Block a user