diff --git a/29WxOrderWpf/App.xaml.cs b/29WxOrderWpf/App.xaml.cs
index 56d7175..f2b9d26 100644
--- a/29WxOrderWpf/App.xaml.cs
+++ b/29WxOrderWpf/App.xaml.cs
@@ -144,7 +144,6 @@ namespace _29WxOrderWpf
#endregion
new MainWindow().Show();
- //new OrderSupportTicketWindow().Show();
}
//static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
diff --git a/29WxOrderWpf/Converters/TextToVisibilityConverter.cs b/29WxOrderWpf/Converters/TextToVisibilityConverter.cs
index a9694a6..0c9130f 100644
--- a/29WxOrderWpf/Converters/TextToVisibilityConverter.cs
+++ b/29WxOrderWpf/Converters/TextToVisibilityConverter.cs
@@ -14,8 +14,6 @@ namespace _29WxOrderWpf.Converters
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
- return Visibility.Collapsed;
-
if (value == null)
return Visibility.Collapsed;
return !value.ParseToString().Trim().IsNullOrEmpty() ? Visibility.Visible : Visibility.Collapsed;
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
index 25ef381..a62e483 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
@@ -1264,7 +1264,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{
// 退款状态有变化才发起修改(退款状态不能从退款成功变成未退款)
PddBuyerAfterSaleLiteInfo afterSaleRefundSuccessExist = null;
- afterSaleRefundSuccessExist = lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.afterSalesId != afterSale.afterSalesId &&
+ afterSaleRefundSuccessExist = lstPddBuyerAfterSaleInfoLite.ToList().FirstOrDefault(a => a.afterSalesId != afterSale.afterSalesId &&
a.orderSn == afterSale.orderSn && (a.AfterSaleStatusStr.Contains("退款成功") || a.AfterSaleStatusStr.Contains("交易已取消")));
if ((afterSaleRefundSuccessExist == null || afterSale.AfterSaleStatusStr == afterSaleRefundSuccessExist.AfterSaleStatusStr) &&
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml
index 490c18c..461d02c 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml
@@ -18,14 +18,6 @@
-
-
-
+
+
-
+
+
+ {
+ orderItem.UpdateOrderItemBuyButton();
+ orderItem.SetAbnormalAndDirectBtnVisibility();
+ });
}
}
}
@@ -353,11 +368,28 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
//OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems)
{
- orderItem.UpdateOrderItemBuyButton();
- orderItem.SetAbnormalAndDirectBtnVisibility();
+ await Task.Run(() =>
+ {
+ orderItem.UpdateOrderItemBuyButton();
+ orderItem.SetAbnormalAndDirectBtnVisibility();
+ });
}
}
}
}
+
+ private void imgTb_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+ {
+ if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible)
+ MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+ if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1)
+ Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1);
+ else
+ Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1);
+
+ Panel.SetZIndex(MainWindow.Instance.tbBuyerOrderReadCtrl, buyZIndex++);
+ MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+ MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
+ }
}
}
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
index a6003bd..8c5587b 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
@@ -270,22 +270,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
Thread.Sleep(1);
Dispatcher.Invoke(new Action(() =>
{
- if (cefShowShopOrderLstWebBrowser == null)
- {
- cefShowShopOrderLstWebBrowser = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false);
- LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler();
- resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
- resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
- cefShowShopOrderLstWebBrowser.RequestHandler = new LocalRequestHandler(resourceRequestHandler);
- var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
- cefShowShopOrderLstWebBrowser.LifeSpanHandler = lifeSapnHandler;
- cefShowShopOrderLstWebBrowser.KeyboardHandler = new CefKeyboardHandler();
- cefShowShopOrderLstWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
- cefShowShopOrderLstWebBrowser.AddressChanged += CefWebBrowser_AddressChanged;
- cefShowShopOrderLstWebBrowser.LoadError += CefWebBrowser_LoadError;
- Grid.SetRow(cefShowShopOrderLstWebBrowser, 0);
- this.GridCef.Children.Add(cefShowShopOrderLstWebBrowser);
- }
if (cefWebBrowser == null)
{
cefWebBrowser = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false);
@@ -305,6 +289,22 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (buyer.wpf_browser == null)
buyer.wpf_browser = cefWebBrowser;
+ if (cefShowShopOrderLstWebBrowser == null)
+ {
+ cefShowShopOrderLstWebBrowser = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false);
+ LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler();
+ resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
+ resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
+ cefShowShopOrderLstWebBrowser.RequestHandler = new LocalRequestHandler(resourceRequestHandler);
+ var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
+ cefShowShopOrderLstWebBrowser.LifeSpanHandler = lifeSapnHandler;
+ cefShowShopOrderLstWebBrowser.KeyboardHandler = new CefKeyboardHandler();
+ cefShowShopOrderLstWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
+ cefShowShopOrderLstWebBrowser.AddressChanged += CefWebBrowser_AddressChanged;
+ cefShowShopOrderLstWebBrowser.LoadError += CefWebBrowser_LoadError;
+ Grid.SetRow(cefShowShopOrderLstWebBrowser, 0);
+ this.GridCef.Children.Add(cefShowShopOrderLstWebBrowser);
+ }
}));
}
}
@@ -2674,7 +2674,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1);
}
- private void CheckBox_Click(object sender, RoutedEventArgs e)
+ private async void CheckBox_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
@@ -2695,18 +2695,18 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
//t.Wait();
foreach (var cook in cookieLst)
{
- var t = WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null));
- t.Wait(5000);
+ await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null));
}
Panel.SetZIndex(this.cefShowShopOrderLstWebBrowser, maxZIndex++);
+ cefShowShopOrderLstWebBrowser.Load("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?");
}
}
}
//if (e.Source)
}
- private void txtBuyerNick_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ private async void txtBuyerNick_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
if (sender is TextBox txt)
{
@@ -2727,11 +2727,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
//t.Wait();
foreach (var cook in cookieLst)
{
- var t = WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null));
- t.Wait(5000);
+ await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null));
}
Panel.SetZIndex(this.cefShowShopOrderLstWebBrowser, maxZIndex++);
+ cefShowShopOrderLstWebBrowser.Load("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?");
}
}
}
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index c0ab436..fb6a5ff 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -60,6 +60,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
///
public partial class OrderListCtrl : UserControl, INotifyPropertyChanged
{
+ private static readonly object locker = new object();
+
public static bool IsAutoBuy { get; set; } = false;
public CheckBox chkSelectAll = null;
OrderFilterConfig _orderFilterConfig;
@@ -506,7 +508,7 @@ 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.SkuAttrStr && 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)
@@ -1019,15 +1021,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
else
{
oms_wei_ewaybill_path_list = JsonHelper.DeserializeJsonToList(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.update_time).ToList();
+ return oms_wei_ewaybill_path_list;
}
}
catch
{
}
}
- if (oms_wei_ewaybill_path_list == null)
- oms_wei_ewaybill_path_list = new List();
- return oms_wei_ewaybill_path_list;
+ return new List();
}
public static List GetBuyProdMap(List orderItems)
@@ -1075,6 +1076,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
catch
{
+ return new List();
}
}
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;
List tabItems = this.tabOrderType.Items.Cast().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 filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
- //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)
{
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
- //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)
{
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
- //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 lstCount = userOrderLst.Where(r => r.IsRefund).Count();
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).Count();
- //Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + 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 filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).Count();
- //Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + 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 filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).Count();
- //Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + 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 filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常需重拍")).Count();
- //Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常需重拍(" + 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 filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).Count();
- //Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")"; }));\
AllOrderTabTxt = "全部订单(" + lstCount + "|" + filteLstTmpCount + ")";
}
- //txtMsg.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
}
CancellationTokenSource TokenSource = null;
@@ -1626,6 +1603,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (this.lbxOrder == null)
return;
+ if (token.IsCancellationRequested)
+ return;
+ Dispatcher.Invoke(new Action(() =>
+ {
+ GlobalConfig.lstFilterOrder.Clear();
+ //GlobalConfig.lstFilterOrder = new ObservableCollection(orderLstTmp);
+ GlobalConfig.lstFilterOrder = new ObservableCollection();
+ this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
+ }));
+
+ if (token.IsCancellationRequested)
+ return;
var orderLstTmp = new List();
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime).ToList();
@@ -1634,23 +1623,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
else
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time).ToList();
- //Task.Run(() => {
+ if (token.IsCancellationRequested)
+ return;
disPlayOrderTabOrderCount();
- //});
- Dispatcher.Invoke(new Action(() =>
- {
- GlobalConfig.lstFilterOrder.Clear();
- }));
+
+ int n = 0;
foreach (var order in orderLstTmp)
{
+ if (n++ % 100 == 0)
+ Thread.Sleep(1);
+
if (token.IsCancellationRequested)
break;
if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
- Dispatcher.Invoke(new Action(() =>
- {
- GlobalConfig.lstFilterOrder.Add(order);
- }));
+ {
+ Dispatcher.Invoke(() => { GlobalConfig.lstFilterOrder.Add(order); });
+ }
}
}
catch (Exception ex)
@@ -1690,11 +1679,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
else
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(() =>
{
- 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
{
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 2adaf0a..32322b4 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -466,7 +466,7 @@
Background="Transparent"
Foreground="#f56c6c"
Text="{Binding ItemRefund.ReasonTextStr}"
- Visibility="{Binding ItemRefund.ReasonTextStrVisibility}" />
+ Visibility="{Binding RefundReasonTextStrVisibility}" />
+ Visibility="{Binding TransitRefundStatusStrVisibility}">
+ Visibility="{Binding ItemTransitOutOrderNoStrVisibility}">
+ Tag="{Binding order_id}">
+ Visibility="{Binding OutOrderTimeQualifiedStrVisibility}">
+ Visibility="{Binding TransitOrderWaybillToWareHouseStrVisibility}">
-
+
-
+
+ Visibility="{Binding TransitExtraPackageWaybillBtnStrVisibility}" />
@@ -942,7 +941,7 @@
+ Visibility="{Binding DirectOrderBuyTimeStrVisibility}">
-
+
-
+
x.OutOrderNumStr);
+ }
+ set { this.SetValue(x => x.OutOrderNumStr, value); }
}
public string OutOrderBuyerStr
{
@@ -30,7 +35,18 @@ namespace AllBase.Model.DBModel
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_sku_id { get; set; }
public string buyer_account { get; set; }
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index 316c541..b1b8a24 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -136,6 +136,8 @@ namespace AllBase.Model.DBModel
//状态10 待付款；20 待发货；21 部分发货；30 待收货；100 完成；200 全部商品售后之后，订单取消；250 未付款用户主动取消或超时未付款订单自动取消；
if (status == 10)
orderStatusStr = "待付款";
+ else if (status == 20)
+ orderStatusStr = "待发货";
else if (status == 21)
orderStatusStr = "部分发货";
else if (status == 30)
@@ -407,7 +409,11 @@ namespace AllBase.Model.DBModel
///
/// 状态10 待付款；20 待发货；21 部分发货；30 待收货；100 完成；200 全部商品售后之后，订单取消；250 未付款用户主动取消或超时未付款订单自动取消；
///
- public int? status { get; set; }
+ public int? status
+ {
+ get { return this.GetValue(x => x.status); }
+ set { this.SetValue(x => x.status, value); SetOrderStatusStr(); }
+ }
///
/// 售后信息json
///
@@ -691,8 +697,6 @@ namespace AllBase.Model.DBModel
public void SetOrderTextProperty()
{
- SetOrderStatusStr();
-
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))
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 77b03a6..e05946f 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -103,11 +103,7 @@ namespace AllBase.Model.DBModel
public order_item_ext OrderItemExt
{
get { return this.GetValue(x => x.OrderItemExt); }
- set
- {
- this.SetValue(x => x.OrderItemExt, value);
- ShopWaybillExceptionStr = value == null ? "" : value.abnormal_text.ParseToString();
- }
+ set { this.SetValue(x => x.OrderItemExt, value); }
}
///
/// 店铺后台显示的物流异常信息（订单扩展信息）
@@ -115,13 +111,18 @@ namespace AllBase.Model.DBModel
public string 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
{
get { return this.GetValue(x => x.ShopWaybillExceptionStrVisibility); }
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
@@ -134,19 +135,32 @@ namespace AllBase.Model.DBModel
public oms_wei_refund_info 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); }
set
{
this.SetValue(x => x.RefundAddressStr, value);
- if (value.ParseToString().Length > 26)
- RefundAddressShortStr = string.Join("", value.ParseToString().Take(26)) + "…";
+ if (RefundAddressStr.ParseToString().Length > 26)
+ RefundAddressShortStr = string.Join("", RefundAddressStr.ParseToString().Take(26)) + "…";
else
- RefundAddressShortStr = value.ParseToString();
+ RefundAddressShortStr = RefundAddressStr.ParseToString().Trim();
RefundAddressShortStrVisibility = RefundAddressShortStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
}
@@ -164,6 +178,10 @@ namespace AllBase.Model.DBModel
public void SetItemRefund()
{
+ if (order_id == "3739902323987233280")
+ {
+
+ }
if (ItemOrder?.refundItems?.Count == 1)
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
else
@@ -193,7 +211,7 @@ namespace AllBase.Model.DBModel
public string 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
{
@@ -254,12 +272,17 @@ namespace AllBase.Model.DBModel
{
get { return this.GetValue(x => x.ItemTransitOrderWithVoid); }
set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); }
- }
+ }
public Visibility ItemTransitOutOrderBuyerStrVisibility
{
get { return this.GetValue(x => x.ItemTransitOutOrderBuyerStrVisibility); }
set { this.SetValue(x => x.ItemTransitOutOrderBuyerStrVisibility, value); }
}
+ public Visibility ItemTransitOutOrderNoStrVisibility
+ {
+ get { return this.GetValue(x => x.ItemTransitOutOrderNoStrVisibility); }
+ set { this.SetValue(x => x.ItemTransitOutOrderNoStrVisibility, value); }
+ }
public List ItemTransitOrderAfterSales { get; set; } = new List();
public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale
{
@@ -276,10 +299,6 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.ItemTransitExtraOrder); }
set
{
- if (order_id == "3739278903964250368")
- {
-
- }
this.SetValue(x => x.ItemTransitExtraOrder, value);
if (ItemTransitExtraOrder != null)
{
@@ -295,12 +314,22 @@ namespace AllBase.Model.DBModel
public string TransitExtraPackageWaybillStr
{
get { return this.GetValue(x => x.TransitExtraPackageWaybillStr); }
- set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); }
+ set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); TransitExtraPackageWaybillStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ }
+ public Visibility TransitExtraPackageWaybillStrVisibility
+ {
+ get { return this.GetValue(x => x.TransitExtraPackageWaybillStrVisibility); }
+ set { this.SetValue(x => x.TransitExtraPackageWaybillStrVisibility, value); }
}
public string TransitExtraPackageWaybillBtnStr
{
get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStr); }
- set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); }
+ set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); TransitExtraPackageWaybillBtnStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ }
+ public Visibility TransitExtraPackageWaybillBtnStrVisibility
+ {
+ get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility); }
+ set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility, value); }
}
public List PddBuyerOrders { get; set; } = new List();
public order_pdd_buyer_order PddBuyerOrder
@@ -322,7 +351,26 @@ namespace AllBase.Model.DBModel
public string PddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
- set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
+ set
+ {
+ this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value);
+ PddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
+
+ if (value.ParseToString().Length > 19)
+ PddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…";
+ else
+ PddBuyerAfterSaleAddressShortStr = value.ParseToString();
+ }
+ }
+ public string PddBuyerAfterSaleAddressShortStr
+ {
+ get { return this.GetValue(x => x.PddBuyerAfterSaleAddressShortStr); }
+ set { this.SetValue(x => x.PddBuyerAfterSaleAddressShortStr, value); }
+ }
+ public Visibility PddBuyerAfterSaleAddressStrVisibility
+ {
+ get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStrVisibility); }
+ set { this.SetValue(x => x.PddBuyerAfterSaleAddressStrVisibility, value); }
}
@@ -334,9 +382,6 @@ 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();
@@ -528,14 +573,19 @@ namespace AllBase.Model.DBModel
/// 拍单物流编号
///
public string TransitOrderWaybillToWareHouseStr
- {
- get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
- set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); }
- }
- ///
- /// 提前取号物流编号（虚拟）
- ///
- public string TransitOrderWaybillFakeStr
+ {
+ get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
+ set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); TransitOrderWaybillToWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ }
+ public Visibility TransitOrderWaybillToWareHouseStrVisibility
+ {
+ get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility); }
+ set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility, value); }
+ }
+ ///
+ /// 提前取号物流编号（虚拟）
+ ///
+ public string TransitOrderWaybillFakeStr
{
get { return this.GetValue(x => x.TransitOrderWaybillFakeStr); }
set { this.SetValue(x => x.TransitOrderWaybillFakeStr, value); }
@@ -546,7 +596,12 @@ namespace AllBase.Model.DBModel
public string TransitOrderWaybillFromWareHouseStr
{
get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
- set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
+ set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); TransitOrderWaybillFromWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ }
+ public Visibility TransitOrderWaybillFromWareHouseStrVisibility
+ {
+ get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility); }
+ set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility, value); }
}
public string TransitWarehouseAfterSaleWayBillStr
{
@@ -777,20 +832,25 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.WarehouseWaybillStatusBackColor); }
set { this.SetValue(x => x.WarehouseWaybillStatusBackColor, value); }
}
- #endregion
+ #endregion
- ///
- /// 中转仓表买手售后字段文字显示
- ///
- public string TransitRefundStatusStr
+ ///
+ /// 中转仓表买手售后字段文字显示
+ ///
+ public string TransitRefundStatusStr
{
get { return this.GetValue(x => x.TransitRefundStatusStr); }
- set { this.SetValue(x => x.TransitRefundStatusStr, value); }
+ set { this.SetValue(x => x.TransitRefundStatusStr, value); TransitRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
- ///
- /// 中转仓表买手售后字段文字显示背景颜色
- ///
- public SolidColorBrush TransitRefundStatusBackColor
+ public Visibility TransitRefundStatusStrVisibility
+ {
+ get { return this.GetValue(x => x.TransitRefundStatusStrVisibility); }
+ set { this.SetValue(x => x.TransitRefundStatusStrVisibility, value); }
+ }
+ ///
+ /// 中转仓表买手售后字段文字显示背景颜色
+ ///
+ public SolidColorBrush TransitRefundStatusBackColor
{
get { return this.GetValue(x => x.TransitRefundStatusBackColor); }
set { this.SetValue(x => x.TransitRefundStatusBackColor, value); }
@@ -849,13 +909,18 @@ namespace AllBase.Model.DBModel
else
TransitRefundVoidStatusStr = "";
}
-
-
+
+
// 仓库采购时间是否达标字段
- public string OutOrderTimeQualifiedStr
+ public string OutOrderTimeQualifiedStr
{
get { return this.GetValue(x => x.OutOrderTimeQualifiedStr); }
- set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); }
+ set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); OutOrderTimeQualifiedStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ }
+ public Visibility OutOrderTimeQualifiedStrVisibility
+ {
+ get { return this.GetValue(x => x.OutOrderTimeQualifiedStrVisibility); }
+ set { this.SetValue(x => x.OutOrderTimeQualifiedStrVisibility, value); }
}
void SetOutOrderTimeQualifiedStr()
{
@@ -1009,7 +1074,12 @@ namespace AllBase.Model.DBModel
public string DirectOrderBuyTimeStr
{
get { return this.GetValue(x => x.DirectOrderBuyTimeStr); }
- set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); }
+ set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); DirectOrderBuyTimeStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+ }
+ public Visibility DirectOrderBuyTimeStrVisibility
+ {
+ get { return this.GetValue(x => x.DirectOrderBuyTimeStrVisibility); }
+ set { this.SetValue(x => x.DirectOrderBuyTimeStrVisibility, value); }
}
@@ -1032,7 +1102,25 @@ namespace AllBase.Model.DBModel
public string DirectPddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); }
- set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); }
+ set
+ {
+ this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value);
+ if (value.ParseToString().Length > 19)
+ DirectPddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…";
+ else
+ DirectPddBuyerAfterSaleAddressShortStr = value.ParseToString();
+ DirectPddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
+ }
+ }
+ public string DirectPddBuyerAfterSaleAddressShortStr
+ {
+ get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr); }
+ set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr, value); }
+ }
+ public Visibility DirectPddBuyerAfterSaleAddressStrVisibility
+ {
+ get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility); }
+ set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); }
}
public string DirectRefundStatusStr
{
@@ -1439,7 +1527,11 @@ namespace AllBase.Model.DBModel
///
/// sku属性JSON
///
- public string sku_attrs { get; set; }
+ public string sku_attrs
+ {
+ get { return this.GetValue(x => x.sku_attrs); }
+ set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); }
+ }
///
/// sku实付总价，取estimate_price和change_price中较小值
///
@@ -1561,7 +1653,6 @@ namespace AllBase.Model.DBModel
// }));
//}
- this.SetSkuAttrStr();
this.SetItemRefund();
this.SetTransitOrder();
this.SetDirectOrder();
@@ -1576,6 +1667,7 @@ namespace AllBase.Model.DBModel
SetOutOrderTimeQualifiedStr();
CalcOrderPrice();
SetOrderItemStatusAndColor();
+ SetOrderItemExtInfo();
if (this.ItemTransitOrders != null)
{
@@ -1584,6 +1676,7 @@ namespace AllBase.Model.DBModel
tOrder.SetOutOrderBuyerStr();
}
ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
+ ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
}
}
diff --git a/AllBase/Model/DBModel/oms_wei_refund_info.cs b/AllBase/Model/DBModel/oms_wei_refund_info.cs
index 373150c..9e73b96 100644
--- a/AllBase/Model/DBModel/oms_wei_refund_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_refund_info.cs
@@ -15,8 +15,8 @@ namespace AllBase.Model.DBModel
{
public string RefundStatusStr
{
- get { return this.GetValue(x => x.status); }
- set { this.SetValue(x => x.status, value); RefundStatusStrVisibility = RefundStatusStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
+ get { return this.GetValue(x => x.RefundStatusStr); }
+ set { this.SetValue(x => x.RefundStatusStr, value); RefundStatusStrVisibility = RefundStatusStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility RefundStatusStrVisibility
{
@@ -52,8 +52,8 @@ namespace AllBase.Model.DBModel
}
public Visibility AfterSaleOrderIdVisibility
{
- get { return this.GetValue(x => x.ReasonTextStrVisibility); }
- set { this.SetValue(x => x.ReasonTextStrVisibility, value); }
+ get { return this.GetValue(x => x.AfterSaleOrderIdVisibility); }
+ set { this.SetValue(x => x.AfterSaleOrderIdVisibility, value); }
}
public long id { get; set; }
@@ -61,7 +61,7 @@ namespace AllBase.Model.DBModel
public string 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; }
}
///
/// 售后单当前状态，参考：
@@ -87,37 +87,37 @@ namespace AllBase.Model.DBModel
public string status
{
get { return this.GetValue(x => x.status); }
- set
- {
- this.SetValue(x => x.status, value);
-
- 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")
+ set
+ {
+ if (order_id == "3739902323987233280")
{
}
+ 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 refundStrLst = new List() { "商家受理中", "待买家退货", "待商家收货", "商家逾期未退款", "退款完成", "退货退款完成", "平台退款中", "待用户确认",
"待用户处理商家协商", "待用户处理商家代发起的售后申请", "物流拦截中"};
@@ -207,7 +207,7 @@ namespace AllBase.Model.DBModel
set
{
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);
}
}
///
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
index fa3cda0..3880602 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
@@ -1181,6 +1181,7 @@ namespace TemuKJD.ToolForms
}
}
}
+ //time=1792314251&code=22107EDBDC132F485500B33B4C58CFDB&code_version=1&version=329&user_name=13367632144&path=29wx&spu_code=10001462916616&sku_code=%e7%bb%bf%e8%89%b2%e6%8c%8e%e5%8c%85%e5%b0%8f%e9%bb%91%e7%8c%ab%e6%8c%82%e4%bb%b6&main_user_name=13367632144&map_goods_name=超萌小黑猫挂件手工编织毛绒公仔多色礼物送朋友&map_spec_name=【大眼猫】挎包绿&map_goods_id=984310168545&map_sku_id=1941546612897&map_send_address=&transit_warehouse_id=XDYSHANDC
url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
var result = await GetHtml.PostUtf8Async(url, data);
if (!result.Contains("\"code\":200"))