优化读取订单的展示
This commit is contained in:
1 parent
b827c6e118
commit
06e45bf587
7 files changed
+127
-105
No files matched your search
@@ -14,8 +14,6 @@ namespace _29WxOrderWpf.Converters
|
|||||||
{
|
{
|
||||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||||
{
|
{
|
||||||
return Visibility.Collapsed;
|
|
||||||
|
|
||||||
if (value == null)
|
if (value == null)
|
||||||
return Visibility.Collapsed;
|
return Visibility.Collapsed;
|
||||||
return !value.ParseToString().Trim().IsNullOrEmpty() ? Visibility.Visible : Visibility.Collapsed;
|
return !value.ParseToString().Trim().IsNullOrEmpty() ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
|||||||
@@ -60,6 +60,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public partial class OrderListCtrl : UserControl, INotifyPropertyChanged
|
public partial class OrderListCtrl : UserControl, INotifyPropertyChanged
|
||||||
{
|
{
|
||||||
|
private static readonly object locker = new object();
|
||||||
|
|
||||||
public static bool IsAutoBuy { get; set; } = false;
|
public static bool IsAutoBuy { get; set; } = false;
|
||||||
public CheckBox chkSelectAll = null;
|
public CheckBox chkSelectAll = null;
|
||||||
OrderFilterConfig _orderFilterConfig;
|
OrderFilterConfig _orderFilterConfig;
|
||||||
@@ -1019,15 +1021,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
oms_wei_ewaybill_path_list = JsonHelper.DeserializeJsonToList<oms_wei_ewaybill_path>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.update_time).ToList();
|
oms_wei_ewaybill_path_list = JsonHelper.DeserializeJsonToList<oms_wei_ewaybill_path>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.update_time).ToList();
|
||||||
|
return oms_wei_ewaybill_path_list;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (oms_wei_ewaybill_path_list == null)
|
return new List<oms_wei_ewaybill_path>();
|
||||||
oms_wei_ewaybill_path_list = new List<oms_wei_ewaybill_path>();
|
|
||||||
return oms_wei_ewaybill_path_list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<WXBuyMapInfo> GetBuyProdMap(List<oms_wei_order_item_info> orderItems)
|
public static List<WXBuyMapInfo> GetBuyProdMap(List<oms_wei_order_item_info> orderItems)
|
||||||
@@ -1075,6 +1076,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
return new List<WXBuyMapInfo>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return GlobalConfig.BuyMapList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
return GlobalConfig.BuyMapList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||||
@@ -1544,71 +1546,46 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
TabItem tabItem = null;
|
TabItem tabItem = null;
|
||||||
List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
|
List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
|
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待采购(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
WaitBuyTabTxt = "待采购(" + lstCount + "|" + filteLstTmpCount + ")";
|
WaitBuyTabTxt = "待采购(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
|
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待发货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
WaitSendTabTxt = "待发货(" + lstCount + "|" + filteLstTmpCount + ")";
|
WaitSendTabTxt = "待发货(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
|
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "待收货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
|
WaitReceiveTabTxt = "待收货(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("售后完成单")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
|
var lstCount = userOrderLst.Where(r => r.IsRefund).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
RefundTabTxt = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")";
|
RefundTabTxt = "售后完成单(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("需处理售后单")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
|
var lstCount = userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
EmergencyManualReturnOrderTabTxt = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
EmergencyManualReturnOrderTabTxt = "需处理售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
|
var lstCount = userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
EmergencyDistribReturnOrderTabTxt = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
EmergencyDistribReturnOrderTabTxt = "退货仓自动售后单(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常需重拍")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
|
var lstCount = userOrderLst.Where(r => r.IsAbnormal).Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
|
||||||
AbnormalTabTxt = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")";
|
AbnormalTabTxt = "异常需重拍(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单")); }));
|
|
||||||
//if (tabItem != null)
|
|
||||||
{
|
{
|
||||||
var lstCount = userOrderLst.Count();
|
var lstCount = userOrderLst.Count();
|
||||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
|
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
|
||||||
//Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")"; }));\
|
|
||||||
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
|
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
|
||||||
}
|
}
|
||||||
//txtMsg.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CancellationTokenSource TokenSource = null;
|
CancellationTokenSource TokenSource = null;
|
||||||
@@ -1626,6 +1603,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (this.lbxOrder == null)
|
if (this.lbxOrder == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (token.IsCancellationRequested)
|
||||||
|
return;
|
||||||
|
Dispatcher.Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
GlobalConfig.lstFilterOrder.Clear();
|
||||||
|
//GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(orderLstTmp);
|
||||||
|
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>();
|
||||||
|
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||||
|
}));
|
||||||
|
|
||||||
|
if (token.IsCancellationRequested)
|
||||||
|
return;
|
||||||
var orderLstTmp = new List<oms_wei_order_info>();
|
var orderLstTmp = new List<oms_wei_order_info>();
|
||||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
||||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime).ToList();
|
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime).ToList();
|
||||||
@@ -1634,23 +1623,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
else
|
else
|
||||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time).ToList();
|
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time).ToList();
|
||||||
|
|
||||||
//Task.Run(() => {
|
if (token.IsCancellationRequested)
|
||||||
|
return;
|
||||||
disPlayOrderTabOrderCount();
|
disPlayOrderTabOrderCount();
|
||||||
//});
|
|
||||||
Dispatcher.Invoke(new Action(() =>
|
int n = 0;
|
||||||
{
|
|
||||||
GlobalConfig.lstFilterOrder.Clear();
|
|
||||||
}));
|
|
||||||
foreach (var order in orderLstTmp)
|
foreach (var order in orderLstTmp)
|
||||||
{
|
{
|
||||||
|
if (n++ % 100 == 0)
|
||||||
|
Thread.Sleep(1);
|
||||||
|
|
||||||
if (token.IsCancellationRequested)
|
if (token.IsCancellationRequested)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
|
if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
|
||||||
Dispatcher.Invoke(new Action(() =>
|
{
|
||||||
{
|
Dispatcher.Invoke(() => { GlobalConfig.lstFilterOrder.Add(order); });
|
||||||
GlobalConfig.lstFilterOrder.Add(order);
|
}
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -1690,11 +1679,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
else
|
else
|
||||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
|
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
|
||||||
|
|
||||||
|
var index = -1;
|
||||||
|
if (nextOrder != null)
|
||||||
|
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
|
||||||
Dispatcher.Invoke(() =>
|
Dispatcher.Invoke(() =>
|
||||||
{
|
{
|
||||||
if (nextOrder != null)
|
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
|
||||||
{
|
{
|
||||||
GlobalConfig.lstFilterOrder.Insert(GlobalConfig.lstFilterOrder.IndexOf(nextOrder), order);
|
GlobalConfig.lstFilterOrder.Insert(index, order);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -466,7 +466,7 @@
|
|||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
Foreground="#f56c6c"
|
Foreground="#f56c6c"
|
||||||
Text="{Binding ItemRefund.ReasonTextStr}"
|
Text="{Binding ItemRefund.ReasonTextStr}"
|
||||||
Visibility="{Binding ItemRefund.ReasonTextStrVisibility}" />
|
Visibility="{Binding RefundReasonTextStrVisibility}" />
|
||||||
|
|
||||||
<!-- 售后结果 -->
|
<!-- 售后结果 -->
|
||||||
<TextBlock
|
<TextBlock
|
||||||
@@ -536,7 +536,7 @@
|
|||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding ItemRefund.after_sale_order_id}"
|
Text="{Binding ItemRefund.after_sale_order_id}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
Visibility="{Binding ItemRefund.AfterSaleOrderIdVisibility}"
|
Visibility="{Binding RefundAfterSaleOrderIdVisibility}"
|
||||||
WaterMark="退款单号" />
|
WaterMark="退款单号" />
|
||||||
<Border
|
<Border
|
||||||
Width="12"
|
Width="12"
|
||||||
@@ -722,7 +722,7 @@
|
|||||||
Title="采购单号:"
|
Title="采购单号:"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
Foreground="#0099ff"
|
Foreground="#0099ff"
|
||||||
Visibility="{Binding ElementName=txtTransitOrderNumStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
Visibility="{Binding ItemTransitOrderWithVoid.OutOrderNumStr, Converter={StaticResource HasTextVisibility}}">
|
||||||
<WrapPanel Orientation="Horizontal">
|
<WrapPanel Orientation="Horizontal">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtTransitOrderNumStr"
|
x:Name="txtTransitOrderNumStr"
|
||||||
|
|||||||
@@ -13,9 +13,14 @@ namespace AllBase.Model.DBModel
|
|||||||
public class oms_wei_external_procurement_log_info : PropertyNotifyObject
|
public class oms_wei_external_procurement_log_info : PropertyNotifyObject
|
||||||
{
|
{
|
||||||
public string OutOrderNumStr
|
public string OutOrderNumStr
|
||||||
{
|
{
|
||||||
get { return out_order_no; }
|
get {
|
||||||
set { }
|
if (this.order_no == "3739906242901888256")
|
||||||
|
{
|
||||||
|
}
|
||||||
|
return this.GetValue(x => x.OutOrderNumStr);
|
||||||
|
}
|
||||||
|
set { this.SetValue(x => x.OutOrderNumStr, value); }
|
||||||
}
|
}
|
||||||
public string OutOrderBuyerStr
|
public string OutOrderBuyerStr
|
||||||
{
|
{
|
||||||
@@ -30,7 +35,18 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
|
|
||||||
public long id { get; set; }
|
public long id { get; set; }
|
||||||
public string out_order_no { get; set; }
|
public string out_order_no
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.out_order_no); }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.order_no == "3739906242901888256")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
this.SetValue(x => x.out_order_no, value); OutOrderNumStr = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
public string order_no { get; set; }
|
public string order_no { get; set; }
|
||||||
public string order_sku_id { get; set; }
|
public string order_sku_id { get; set; }
|
||||||
public string buyer_account { get; set; }
|
public string buyer_account { get; set; }
|
||||||
|
|||||||
@@ -136,6 +136,8 @@ namespace AllBase.Model.DBModel
|
|||||||
//状态10 待付款;20 待发货;21 部分发货;30 待收货;100 完成;200 全部商品售后之后,订单取消;250 未付款用户主动取消或超时未付款订单自动取消;
|
//状态10 待付款;20 待发货;21 部分发货;30 待收货;100 完成;200 全部商品售后之后,订单取消;250 未付款用户主动取消或超时未付款订单自动取消;
|
||||||
if (status == 10)
|
if (status == 10)
|
||||||
orderStatusStr = "待付款";
|
orderStatusStr = "待付款";
|
||||||
|
else if (status == 20)
|
||||||
|
orderStatusStr = "待发货";
|
||||||
else if (status == 21)
|
else if (status == 21)
|
||||||
orderStatusStr = "部分发货";
|
orderStatusStr = "部分发货";
|
||||||
else if (status == 30)
|
else if (status == 30)
|
||||||
@@ -407,7 +409,11 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态10 待付款;20 待发货;21 部分发货;30 待收货;100 完成;200 全部商品售后之后,订单取消;250 未付款用户主动取消或超时未付款订单自动取消;
|
/// 状态10 待付款;20 待发货;21 部分发货;30 待收货;100 完成;200 全部商品售后之后,订单取消;250 未付款用户主动取消或超时未付款订单自动取消;
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? status { get; set; }
|
public int? status
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.status); }
|
||||||
|
set { this.SetValue(x => x.status, value); SetOrderStatusStr(); }
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 售后信息json
|
/// 售后信息json
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -691,8 +697,6 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public void SetOrderTextProperty()
|
public void SetOrderTextProperty()
|
||||||
{
|
{
|
||||||
SetOrderStatusStr();
|
|
||||||
|
|
||||||
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
|
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
|
||||||
|
|
||||||
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
|
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
|
||||||
|
|||||||
@@ -103,11 +103,7 @@ namespace AllBase.Model.DBModel
|
|||||||
public order_item_ext OrderItemExt
|
public order_item_ext OrderItemExt
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.OrderItemExt); }
|
get { return this.GetValue(x => x.OrderItemExt); }
|
||||||
set
|
set { this.SetValue(x => x.OrderItemExt, value); }
|
||||||
{
|
|
||||||
this.SetValue(x => x.OrderItemExt, value);
|
|
||||||
ShopWaybillExceptionStr = value == null ? "" : value.abnormal_text.ParseToString();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 店铺后台显示的物流异常信息(订单扩展信息)
|
/// 店铺后台显示的物流异常信息(订单扩展信息)
|
||||||
@@ -115,13 +111,18 @@ namespace AllBase.Model.DBModel
|
|||||||
public string ShopWaybillExceptionStr
|
public string ShopWaybillExceptionStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.ShopWaybillExceptionStr); }
|
get { return this.GetValue(x => x.ShopWaybillExceptionStr); }
|
||||||
set { this.SetValue(x => x.ShopWaybillExceptionStr, value); ShopWaybillExceptionStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
set { this.SetValue(x => x.ShopWaybillExceptionStr, value); }
|
||||||
}
|
}
|
||||||
public Visibility ShopWaybillExceptionStrVisibility
|
public Visibility ShopWaybillExceptionStrVisibility
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.ShopWaybillExceptionStrVisibility); }
|
get { return this.GetValue(x => x.ShopWaybillExceptionStrVisibility); }
|
||||||
set { this.SetValue(x => x.ShopWaybillExceptionStrVisibility, value); }
|
set { this.SetValue(x => x.ShopWaybillExceptionStrVisibility, value); }
|
||||||
}
|
}
|
||||||
|
void SetOrderItemExtInfo()
|
||||||
|
{
|
||||||
|
ShopWaybillExceptionStr = OrderItemExt == null ? "" : OrderItemExt.abnormal_text.ParseToString();
|
||||||
|
ShopWaybillExceptionStrVisibility = ShopWaybillExceptionStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public oms_wei_order_info ItemOrder
|
public oms_wei_order_info ItemOrder
|
||||||
@@ -134,19 +135,32 @@ namespace AllBase.Model.DBModel
|
|||||||
public oms_wei_refund_info ItemRefund
|
public oms_wei_refund_info ItemRefund
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.ItemRefund); }
|
get { return this.GetValue(x => x.ItemRefund); }
|
||||||
set { this.SetValue(x => x.ItemRefund, value); }
|
set { this.SetValue(x => x.ItemRefund, value);
|
||||||
|
RefundReasonTextStrVisibility = ItemRefund?.ReasonTextStrVisibility ?? Visibility.Collapsed;
|
||||||
|
RefundAfterSaleOrderIdVisibility = ItemRefund?.AfterSaleOrderIdVisibility ?? Visibility.Collapsed; }
|
||||||
}
|
}
|
||||||
public string RefundAddressStr
|
public Visibility RefundReasonTextStrVisibility
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.RefundReasonTextStrVisibility); }
|
||||||
|
set { this.SetValue(x => x.RefundReasonTextStrVisibility, value); }
|
||||||
|
}
|
||||||
|
public Visibility RefundAfterSaleOrderIdVisibility
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.RefundAfterSaleOrderIdVisibility); }
|
||||||
|
set { this.SetValue(x => x.RefundAfterSaleOrderIdVisibility, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string RefundAddressStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.RefundAddressStr); }
|
get { return this.GetValue(x => x.RefundAddressStr); }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
this.SetValue(x => x.RefundAddressStr, value);
|
this.SetValue(x => x.RefundAddressStr, value);
|
||||||
|
|
||||||
if (value.ParseToString().Length > 26)
|
if (RefundAddressStr.ParseToString().Length > 26)
|
||||||
RefundAddressShortStr = string.Join("", value.ParseToString().Take(26)) + "…";
|
RefundAddressShortStr = string.Join("", RefundAddressStr.ParseToString().Take(26)) + "…";
|
||||||
else
|
else
|
||||||
RefundAddressShortStr = value.ParseToString();
|
RefundAddressShortStr = RefundAddressStr.ParseToString().Trim();
|
||||||
|
|
||||||
RefundAddressShortStrVisibility = RefundAddressShortStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
|
RefundAddressShortStrVisibility = RefundAddressShortStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
|
||||||
}
|
}
|
||||||
@@ -164,6 +178,10 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public void SetItemRefund()
|
public void SetItemRefund()
|
||||||
{
|
{
|
||||||
|
if (order_id == "3739902323987233280")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
if (ItemOrder?.refundItems?.Count == 1)
|
if (ItemOrder?.refundItems?.Count == 1)
|
||||||
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
|
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
|
||||||
else
|
else
|
||||||
@@ -193,7 +211,7 @@ namespace AllBase.Model.DBModel
|
|||||||
public string RefundResultStr
|
public string RefundResultStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.RefundResultStr); }
|
get { return this.GetValue(x => x.RefundResultStr); }
|
||||||
set { this.SetValue(x => x.RefundResultStr, value); RefundResultStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
set { this.SetValue(x => x.RefundResultStr, value); RefundResultStrVisibility = RefundResultStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
||||||
}
|
}
|
||||||
public Visibility RefundResultStrVisibility
|
public Visibility RefundResultStrVisibility
|
||||||
{
|
{
|
||||||
@@ -276,10 +294,6 @@ namespace AllBase.Model.DBModel
|
|||||||
get { return this.GetValue(x => x.ItemTransitExtraOrder); }
|
get { return this.GetValue(x => x.ItemTransitExtraOrder); }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (order_id == "3739278903964250368")
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
this.SetValue(x => x.ItemTransitExtraOrder, value);
|
this.SetValue(x => x.ItemTransitExtraOrder, value);
|
||||||
if (ItemTransitExtraOrder != null)
|
if (ItemTransitExtraOrder != null)
|
||||||
{
|
{
|
||||||
@@ -334,9 +348,6 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public void SetTransitOrder()
|
public void SetTransitOrder()
|
||||||
{
|
{
|
||||||
if (order_id == "3739241588056569856")
|
|
||||||
{
|
|
||||||
}
|
|
||||||
this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
|
this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
|
||||||
this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
|
this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
|
||||||
this.SetTransitRefundStatusStr();
|
this.SetTransitRefundStatusStr();
|
||||||
@@ -1576,6 +1587,7 @@ namespace AllBase.Model.DBModel
|
|||||||
SetOutOrderTimeQualifiedStr();
|
SetOutOrderTimeQualifiedStr();
|
||||||
CalcOrderPrice();
|
CalcOrderPrice();
|
||||||
SetOrderItemStatusAndColor();
|
SetOrderItemStatusAndColor();
|
||||||
|
SetOrderItemExtInfo();
|
||||||
|
|
||||||
if (this.ItemTransitOrders != null)
|
if (this.ItemTransitOrders != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
public string RefundStatusStr
|
public string RefundStatusStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.status); }
|
get { return this.GetValue(x => x.RefundStatusStr); }
|
||||||
set { this.SetValue(x => x.status, value); RefundStatusStrVisibility = RefundStatusStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
set { this.SetValue(x => x.RefundStatusStr, value); RefundStatusStrVisibility = RefundStatusStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
||||||
}
|
}
|
||||||
public Visibility RefundStatusStrVisibility
|
public Visibility RefundStatusStrVisibility
|
||||||
{
|
{
|
||||||
@@ -52,8 +52,8 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
public Visibility AfterSaleOrderIdVisibility
|
public Visibility AfterSaleOrderIdVisibility
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.ReasonTextStrVisibility); }
|
get { return this.GetValue(x => x.AfterSaleOrderIdVisibility); }
|
||||||
set { this.SetValue(x => x.ReasonTextStrVisibility, value); }
|
set { this.SetValue(x => x.AfterSaleOrderIdVisibility, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public long id { get; set; }
|
public long id { get; set; }
|
||||||
@@ -61,7 +61,7 @@ namespace AllBase.Model.DBModel
|
|||||||
public string after_sale_order_id
|
public string after_sale_order_id
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.after_sale_order_id); }
|
get { return this.GetValue(x => x.after_sale_order_id); }
|
||||||
set { this.SetValue(x => x.after_sale_order_id, value); ReasonTextStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
set { this.SetValue(x => x.after_sale_order_id, value); AfterSaleOrderIdVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 售后单当前状态,参考:
|
/// 售后单当前状态,参考:
|
||||||
@@ -87,37 +87,37 @@ namespace AllBase.Model.DBModel
|
|||||||
public string status
|
public string status
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.status); }
|
get { return this.GetValue(x => x.status); }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
this.SetValue(x => x.status, value);
|
if (order_id == "3739902323987233280")
|
||||||
|
|
||||||
this.RefundStatusStr = "售后状态读取失败";
|
|
||||||
if (value == "USER_CANCELD") this.RefundStatusStr = "用户取消申请";
|
|
||||||
else if (value == "MERCHANT_PROCESSING") this.RefundStatusStr = "商家受理中";
|
|
||||||
else if (value == "MERCHANT_REJECT_REFUND") this.RefundStatusStr = "商家拒绝退款";
|
|
||||||
else if (value == "MERCHANT_REJECT_RETURN") this.RefundStatusStr = "商家拒绝退货退款";
|
|
||||||
else if (value == "USER_WAIT_RETURN") this.RefundStatusStr = "待买家退货";
|
|
||||||
else if (value == "RETURN_CLOSED") this.RefundStatusStr = "退货退款关闭";
|
|
||||||
else if (value == "MERCHANT_WAIT_RECEIPT") this.RefundStatusStr = "待商家收货";
|
|
||||||
else if (value == "MERCHANT_OVERDUE_REFUND") this.RefundStatusStr = "商家逾期未退款";
|
|
||||||
else if (value == "MERCHANT_REFUND_SUCCESS") this.RefundStatusStr = "退款完成";
|
|
||||||
else if (value == "MERCHANT_RETURN_SUCCESS") this.RefundStatusStr = "退货退款完成";
|
|
||||||
else if (value == "PLATFORM_REFUNDING") this.RefundStatusStr = "平台退款中";
|
|
||||||
else if (value == "PLATFORM_REFUND_FAIL") this.RefundStatusStr = "平台退款失败";
|
|
||||||
else if (value == "USER_WAIT_CONFIRM") this.RefundStatusStr = "待用户确认";
|
|
||||||
else if (value == "MERCHANT_REFUND_RETRY_FAIL") this.RefundStatusStr = "商家打款失败,客服关闭售后";
|
|
||||||
else if (value == "MERCHANT_FAIL") this.RefundStatusStr = "售后关闭";
|
|
||||||
else if (value == "USER_WAIT_CONFIRM_UPDATE") this.RefundStatusStr = "待用户处理商家协商";
|
|
||||||
else if (value == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE") this.RefundStatusStr = "待用户处理商家代发起的售后申请";
|
|
||||||
else if (value == "WAIT_PACKAGE_INTERCEPT") this.RefundStatusStr = "物流拦截中";
|
|
||||||
else if (value == "USER_WAIT_RECEIPT") this.RefundStatusStr = "换货商品已发货";
|
|
||||||
else this.RefundStatusStr = value;
|
|
||||||
//MERCHANT_EXCHANGE_SUCCESS
|
|
||||||
|
|
||||||
if (order_id == "3738189148379849472")
|
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
this.SetValue(x => x.status, value);
|
||||||
|
|
||||||
|
this.RefundStatusStr = "售后状态读取失败";
|
||||||
|
if (status == "USER_CANCELD") this.RefundStatusStr = "用户取消申请";
|
||||||
|
else if (status == "MERCHANT_PROCESSING") this.RefundStatusStr = "商家受理中";
|
||||||
|
else if (status == "MERCHANT_REJECT_REFUND") this.RefundStatusStr = "商家拒绝退款";
|
||||||
|
else if (status == "MERCHANT_REJECT_RETURN") this.RefundStatusStr = "商家拒绝退货退款";
|
||||||
|
else if (status == "USER_WAIT_RETURN") this.RefundStatusStr = "待买家退货";
|
||||||
|
else if (status == "RETURN_CLOSED") this.RefundStatusStr = "退货退款关闭";
|
||||||
|
else if (status == "MERCHANT_WAIT_RECEIPT") this.RefundStatusStr = "待商家收货";
|
||||||
|
else if (status == "MERCHANT_OVERDUE_REFUND") this.RefundStatusStr = "商家逾期未退款";
|
||||||
|
else if (status == "MERCHANT_REFUND_SUCCESS") this.RefundStatusStr = "退款完成";
|
||||||
|
else if (status == "MERCHANT_RETURN_SUCCESS") this.RefundStatusStr = "退货退款完成";
|
||||||
|
else if (status == "PLATFORM_REFUNDING") this.RefundStatusStr = "平台退款中";
|
||||||
|
else if (status == "PLATFORM_REFUND_FAIL") this.RefundStatusStr = "平台退款失败";
|
||||||
|
else if (status == "USER_WAIT_CONFIRM") this.RefundStatusStr = "待用户确认";
|
||||||
|
else if (status == "MERCHANT_REFUND_RETRY_FAIL") this.RefundStatusStr = "商家打款失败,客服关闭售后";
|
||||||
|
else if (status == "MERCHANT_FAIL") this.RefundStatusStr = "售后关闭";
|
||||||
|
else if (status == "USER_WAIT_CONFIRM_UPDATE") this.RefundStatusStr = "待用户处理商家协商";
|
||||||
|
else if (status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE") this.RefundStatusStr = "待用户处理商家代发起的售后申请";
|
||||||
|
else if (status == "WAIT_PACKAGE_INTERCEPT") this.RefundStatusStr = "物流拦截中";
|
||||||
|
else if (status == "USER_WAIT_RECEIPT") this.RefundStatusStr = "换货商品已发货";
|
||||||
|
else this.RefundStatusStr = status;
|
||||||
|
//MERCHANT_EXCHANGE_SUCCESS
|
||||||
|
|
||||||
|
|
||||||
List<string> refundStrLst = new List<string>() { "商家受理中", "待买家退货", "待商家收货", "商家逾期未退款", "退款完成", "退货退款完成", "平台退款中", "待用户确认",
|
List<string> refundStrLst = new List<string>() { "商家受理中", "待买家退货", "待商家收货", "商家逾期未退款", "退款完成", "退货退款完成", "平台退款中", "待用户确认",
|
||||||
"待用户处理商家协商", "待用户处理商家代发起的售后申请", "物流拦截中"};
|
"待用户处理商家协商", "待用户处理商家代发起的售后申请", "物流拦截中"};
|
||||||
@@ -207,7 +207,7 @@ namespace AllBase.Model.DBModel
|
|||||||
set
|
set
|
||||||
{
|
{
|
||||||
this.SetValue(x => x.reason_text, value);
|
this.SetValue(x => x.reason_text, value);
|
||||||
ReasonTextStr = string.IsNullOrEmpty(reason_text) ? string.Empty : "售后原因:" + reason_text;
|
ReasonTextStr = string.IsNullOrEmpty(reason_text) ? string.Empty : ("售后原因:" + reason_text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in new issue
Block a user