继续调整订单样式
This commit is contained in:
1 parent
031fa8cfe6
commit
a005946410
13 files changed
+1166
-326
No files matched your search
@@ -70,6 +70,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
lstOrder.SortDesc(o => o.order_id.ParseToLong());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="filterGetCondition">按过滤条件读取读取服务端订单</param>
|
||||
void GetOrder(bool filterGetCondition = false)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
@@ -92,6 +96,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
page++;
|
||||
var url = BaseClass.Build29WxObjString("order/get_order_list");
|
||||
var data = UserLogin.GetSignaturex() + "&page=" + page;
|
||||
if (page > 1)
|
||||
data += "&is_not_count=true";
|
||||
data += "&page_size=" + pageSize;
|
||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
@@ -131,6 +137,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
}
|
||||
|
||||
// 读取订单详情
|
||||
Thread.Sleep(100);
|
||||
var url1 = BaseClass.Build29WxObjString("order/get_order_item_list");
|
||||
var data1 = UserLogin.GetSignaturex();
|
||||
data1 += "&erp_order_id_in=" + order_ids;
|
||||
@@ -142,9 +150,25 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
|
||||
try { orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item_info>(JObject.Parse(html1)["data"].ParseToString()); } catch { }
|
||||
|
||||
|
||||
List<oms_wei_order_item> orderItems = new List<oms_wei_order_item>();
|
||||
try { orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item>(JObject.Parse(html1)["data"].ParseToString()); } catch { }
|
||||
// 读取售后单
|
||||
Thread.Sleep(100);
|
||||
var url2 = BaseClass.Build29WxObjString("order/get_refund_list");
|
||||
var data2 = UserLogin.GetSignaturex();
|
||||
data2 += "&erp_order_id_in=" + order_ids;
|
||||
var html2 = GetHtml.PostUtf8(url2, data2);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
html2 = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
|
||||
try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
|
||||
|
||||
foreach (JObject jObj in jArr)
|
||||
{
|
||||
@@ -153,15 +177,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
try
|
||||
{
|
||||
var order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
order.order_items = new ObservableCollection<oms_wei_order_item>();
|
||||
foreach(var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
//装载订单商品详情
|
||||
order.order_items = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
if (item.cash_coupon_discounted_price > 0)
|
||||
{
|
||||
|
||||
}
|
||||
item.item_order = order;
|
||||
order.order_items.Add(item);
|
||||
}
|
||||
//装载订单售后详情
|
||||
order.refunds = new ObservableCollection<oms_wei_refund_info>();
|
||||
foreach (var item in refunds.Where(of => of.order_id == order.order_id))
|
||||
{
|
||||
order.refunds.Add(item);
|
||||
}
|
||||
|
||||
var orderExist = lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
@@ -176,6 +204,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
lstOrder.Add(order);
|
||||
}
|
||||
if (order.order_items.Count > 1)
|
||||
{
|
||||
}
|
||||
|
||||
FilterOneOrder(order);
|
||||
}
|
||||
@@ -204,7 +235,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
tabItem.Header = "退款单(" + lstOrder.Where(r => r.status == 200).Count() + ")";
|
||||
tabItem.Header = "退款单(" + lstOrder.Where(r => /*r.status == 200 ||*/ r.refunds?.Count > 0).Count() + ")";
|
||||
}
|
||||
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
|
||||
if (tabItem != null)
|
||||
@@ -302,7 +333,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("退款单") && (order.status != 200))
|
||||
if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("退款单") && (/*order.status != 200 &&*/ (order.refunds?.Count).ParseToInt() == 0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -353,8 +384,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (container != null)
|
||||
{
|
||||
// 找到grid控件并修改列大小
|
||||
Grid grid = UiCtrlUtils.FindVisualChild<Grid>(container, "gridListItem");
|
||||
if (grid != null)
|
||||
var grids = UiCtrlUtils.FindVisualChildAll<Grid>(container, "gridListItem");
|
||||
foreach (var grid in grids)
|
||||
{
|
||||
for (int i = 0; i < grid.ColumnDefinitions.Count; i++)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user