chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化订单读取卡顿问题

Browse Source
This commit is contained in:
wule committed 2026-10-17 07:13:38 +08:00
1 parent c83521f36d
commit 1509e0a11d
15 files changed
+718 -542
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Converters/ListBoxIndexConverter.cs
+3
View File
@@ -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;
}
29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+10 -10
View File
@@ -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;
}
}
29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs
+4 -4
View File
@@ -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;
29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
+4 -4
View File
@@ -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;
29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
+4 -4
View File
@@ -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;
}
}
29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+15 -6
View File
@@ -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">
29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+357 -205
View File
File diff suppressed because it is too large. Load diff
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
+8
View File
@@ -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>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
+16 -14
View File
@@ -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)
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+4 -4
View File
@@ -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>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+1 -1
View File
@@ -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(); // 当前库存;
29WxOrderWpf/ViewModels/BuyMapSkuViewModel.cs
+4 -4
View File
@@ -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;
29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs
+3 -3
View File
@@ -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;
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+281 -279
View File
@@ -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();
@@ -738,176 +734,175 @@ 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
{
//if (ItemTransitOrderWithVoid?.order_void_status == 2)
// return "中转作废失败";
if (ItemTransitOrderWithVoid?.order_void_status == 1)
return "中转已作废";
return "";
}
set { }
}
// 仓库采购时间是否达标字段
public string OutOrderTimeQualifiedStr
{
get
{
if (ItemTransitOrderWithVoid == null)
return "";
{
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 = "";
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 + " √";
}
set { }
}
// 显示售后金额（如果有）
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)
TransitRefundVoidStatusStr = "中转已作废";
}
// 仓库采购时间是否达标字段
public string OutOrderTimeQualifiedStr
{
get { return this.GetValue(x => x.OutOrderTimeQualifiedStr); }
set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); }
}
void SetOutOrderTimeQualifiedStr()
{
if (ItemTransitOrderWithVoid == null)
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))
OutOrderTimeQualifiedStr = timeStr + " ×";
else
OutOrderTimeQualifiedStr = timeStr + " √";
}
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>
/// 微信订单状态参数
/// </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;
}
set { }
}
{
get { return this.GetValue(x => x.OrderItemStatusBackColor); }
set { this.SetValue(x => x.OrderItemStatusBackColor, value); }
}
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,31 +1043,83 @@ 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>
/// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)文本
/// </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,135 +1127,85 @@ 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>
/// 运费文本
/// </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
{
//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 { }
}
public string PredictCommissionFeeStr
{
get { return this.GetValue(x => x.PredictCommissionFeeStr); }
set { this.SetValue(x => x.PredictCommissionFeeStr, value); }
}
/// <summary>
/// 达人佣金
/// </summary>
public string commission_amount_str
{
//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 { }
}
public string CommissionAmountStr
{
get { return this.GetValue(x => x.PredictCommissionFeeStr); }
set { this.SetValue(x => x.PredictCommissionFeeStr, value); }
}
/// <summary>
/// 外采金额文本
/// </summary>
public string out_amount_str
{
//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");
public string OutAmountStr
{
get { return this.GetValue(x => x.OutAmountStr); }
set { this.SetValue(x => x.OutAmountStr, value); }
}
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 { }
}
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>
/// 通过计算的利润文本
/// </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;
}
set { }
}
{
get { return this.GetValue(x => x.ProfitStrColor); }
set { this.SetValue(x => x.ProfitStrColor, value); }
}
public DateTime CreateDateTime
{
@@ -1235,20 +1232,21 @@ namespace AllBase.Model.DBModel
/// <summary>
/// sku规格名称文本
/// </summary>
public string sku_attr_str
{
get
{
try
{
var jObj = JArray.Parse(sku_attrs);
var str = string.Join(",", jObj.Select(j => j["attr_value"].ParseToString()));
return str;
}
catch { return "获取失败"; }
}
set { }
}
public string SkuAttrStr
{
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()));
SkuAttrStr = str;
}
catch { SkuAttrStr = "获取失败"; }
}
/// <summary>
/// 拼多多秒退异常重拍按钮可见条件
@@ -1482,16 +1480,17 @@ namespace AllBase.Model.DBModel
CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss");
UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
//if (PurpleBrush == null && GlobalConfig.Dispatcher != null)
//{
// // 初始化笔刷，必修Invoke;
// GlobalConfig.Dispatcher.Invoke(new Action(() =>
// {
// }));
//}
//if (PurpleBrush == null && GlobalConfig.Dispatcher != null)
//{
// // 初始化笔刷，必修Invoke;
// GlobalConfig.Dispatcher.Invoke(new Action(() =>
// {
this.SetItemRefund();
// }));
//}
this.SetSkuAttrStr();
this.SetItemRefund();
this.SetTransitOrder();
this.SetDirectOrder();
this.SetBuyerTransitWaybillStatusStr();
@@ -1502,6 +1501,9 @@ namespace AllBase.Model.DBModel
this.SetAbnormalAndDirectBtnVisibility();
SetEWaybillInfo();
SetOutOrderTimeQualifiedStr();
CalcOrderPrice();
SetOrderItemStatusAndColor();
}
/// <summary> 初始化物流明细信息 </summary>
Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+4 -4
View File
@@ -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;