订单分类显示 快递金额明细统计, 快递在线充值 等
This commit is contained in:
1 parent
7264835cc6
commit
e00209cb24
37 files changed
+2764
-520
No files matched your search
@@ -209,13 +209,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError("请选择买手号");
|
||||
return;
|
||||
}
|
||||
|
||||
if (/*orderItem.sku_cnt > 1 ||*/ orderItem.ItemOrder.orderItems.Count > 1)
|
||||
{
|
||||
//BaseMsgWindow.ShowError("多子单或多件商品订单中转仓暂不支持");
|
||||
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
|
||||
return;
|
||||
}
|
||||
if (GlobalConfig.lstOrder.Any(o => o.orderItems.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
|
||||
{
|
||||
BaseMsgWindow.ShowError("已存在中转拍单信息,请核对后再拍单");
|
||||
}
|
||||
|
||||
btnBuyOrder.Cursor = Cursors.Wait;
|
||||
btnBuyOrder.IsEnabled = false;
|
||||
@@ -455,7 +458,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
btnBuyOrder.Cursor = Cursors.Hand;
|
||||
|
||||
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
|
||||
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance,
|
||||
orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
|
||||
|
||||
// 未关联拍单的跳到所有订单页面
|
||||
buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/orders.html"; //"?type=0&comment_tab=1&combine_orders=1&main_orders=1&refer_page_name=personal&refer_page_id=10001_1782219035613_a9ulipk4k3&refer_page_sn=10001";
|
||||
@@ -511,6 +515,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 缩略图在有的电脑上无法显示
|
||||
//BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
||||
BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img);
|
||||
Thread.Sleep(Randomx.GetId(1000));
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
imgOrderItem.Source = bImg;
|
||||
@@ -527,9 +532,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
btnVoidTransitOrder.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
if (order_item.ItemOrder.isAbnormal && order_item.BuyerTransitWaybillStatusStr != "已到中转仓" && btnVoidTransitOrder.Visibility == Visibility.Collapsed)
|
||||
// 异常重拍
|
||||
if (order_item.ItemOrder.isAbnormal && order_item.BuyerTransitWaybillStatusStr != "已到中转仓" && btnVoidTransitOrder.Visibility == Visibility.Collapsed)
|
||||
{
|
||||
btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
|
||||
// 取号异常/失败的异常单不能重拍
|
||||
if (((order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") || (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
|
||||
order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
|
||||
btnAbnormalOrderRebuy.Visibility = Visibility.Collapsed;
|
||||
else
|
||||
btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -595,7 +606,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return;
|
||||
}
|
||||
|
||||
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
|
||||
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance,
|
||||
orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
|
||||
|
||||
//所有订单页面
|
||||
buyOrderForm.InitUrl = url;
|
||||
@@ -686,27 +698,26 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder.orderItems.Count == 1)
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
if (orderItem == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("订单查询失败,请重试");
|
||||
return;
|
||||
}
|
||||
|
||||
if (orderItem.ItemTransitOrder == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("要作废的中转订单不存在,请确认后重试");
|
||||
return;
|
||||
}
|
||||
});
|
||||
if (orderItem == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("订单查询失败,请重试");
|
||||
return;
|
||||
}
|
||||
if (orderItem.ItemTransitOrder == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("要作废的中转订单不存在,请确认后重试");
|
||||
return;
|
||||
}
|
||||
|
||||
bool noBuyer = false;
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_name == orderItem.ItemTransitOrder.buyer_account);
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_name == orderItem?.ItemTransitOrder?.buyer_account);
|
||||
if (buyer == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
@@ -768,10 +779,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (discardRst.Contains("<code>0</code>") || discardRst.Contains("<code>200</code>"))
|
||||
{
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
#region 更新订单
|
||||
#region 立即更新订单
|
||||
orderItem.ItemTransitOrder.order_void_status = 1;
|
||||
orderItem.SetTransitOrder();
|
||||
orderItem.SetItemRefund();
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
#endregion
|
||||
|
||||
#region 重新过滤订单
|
||||
@@ -781,17 +791,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
#endregion
|
||||
|
||||
#region 更新拍单余额
|
||||
var url3 = BaseClass.Build29WxObjString("user/get_all_user");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&search_user_name=" + BaseClass.UserName;
|
||||
var html = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url3, data3);
|
||||
if (html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
|
||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||
}
|
||||
StartUp.UpdateBalance();
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user