订单任务,现已修改成全局任务列表 包括 订单任务和礼品单任务

订单列表动态展示礼品单状态
This commit is contained in:
chfei committed 2026-08-24 18:11:44 +08:00
1 parent 78dc8a5d03
commit 7998a753cc
20 files changed
+2820 -2627

No files matched your search

@@ -46,6 +46,7 @@ using TemuKJD.ToolForms;
using Work;
using Work._29Tools.BLL;
using Work.BuyUsers;
using Work.KJDServer.API.Models;
using WPFCommon.Helpers;
using static _29WxOrderWpf.Services.ShipGiftService;
using static System.Net.Mime.MediaTypeNames;
@@ -62,7 +63,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
public OrderFilterConfig orderFilterConfig
{
get { return _orderFilterConfig; }
set { if (_orderFilterConfig != value)
set
{
if (_orderFilterConfig != value)
_orderFilterConfig = value;
OnPropertyChanged(new PropertyChangedEventArgs("orderFilterConfig"));
}
@@ -76,7 +79,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
InitializeComponent();
DataContext = this;
_shipGiftService = new ShipGiftService();
_shipGiftService = ShipGiftService.Instance;
}
private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -103,8 +106,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
borderFilterRemarkSelect.Visibility = Visibility.Collapsed;
AutoGetOrder();
TaskService.Instance.Start();
TaskService.Instance.TaskChanged += Instance_TaskChanged;
}
//public void GetOrderTest()
//{
// for (int i = 0; i < 10000; i++)
@@ -837,7 +845,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
}
if (orderItem.TransitRefundStatusStr.ParseToString().Contains("需手动申请售后") &&
if (orderItem.TransitRefundStatusStr.ParseToString().Contains("需手动申请售后") &&
orderItem.ItemTransitOrderWithVoid?.has_reject == 3 && orderItem.ItemTransitOrderWithVoid?.platform != "XDYYWC") // 义乌仓不支持拒收,等于3也是失败
{
// 拒收后24小时才去总店填拒收退货
@@ -1043,7 +1051,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var type = 4;
if (chkRst.Contains("\"interactType\":0"))
type = 2;
var result = AddReturnPddShopPackageInfo(buyer, orderSn, afterSalesId, waybillId,"韵达快递", "121", type.ToString());
var result = AddReturnPddShopPackageInfo(buyer, orderSn, afterSalesId, waybillId, "韵达快递", "121", type.ToString());
if (!result.Contains("\"result\":\"ok\""))
{
type = type == 4 ? 2 : 4;
@@ -1096,7 +1104,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
TabItem tabItem = null;
List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); }));
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); }));
if (tabItem != null)
{
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).ToList();
@@ -1513,7 +1521,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Thread.Sleep(5000);
Dispatcher.Invoke(new Action(() => { this.btnSearch.IsEnabled = true; }));
});
});
//Task.Run(() =>
//{
// GetOrder();
@@ -1902,7 +1910,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
public async Task DoReturnOrderBuyerRefendSlient()
{
List<oms_wei_order_info> emergencyRefundOrders = new List<oms_wei_order_info>();
Dispatcher.Invoke(new Action(() =>
Dispatcher.Invoke(new Action(() =>
{
emergencyRefundOrders = GlobalConfig.lstOrder.Where(o => o.IsEmergency).ToList();
}));
@@ -2281,7 +2289,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
FilterOrders();
}
/// <summary>
///
@@ -2398,7 +2406,27 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// set => SetProperty(ref _IsShipGift, value);
//}
private void Instance_TaskChanged(object sender, IEnumerable<Work.KJDServer.API.Models.TaskItem> data)
{
var giftTaks = data.Where(a => a.TaskType == Work.KJDServer.API.Models.TaskType.Gifts && a.SubTasks != null)
.SelectMany(a => a.SubTasks)
.GroupBy(a => a.ObjectId)
.Select(a => a.OrderByDescending(b => b.CreateTime).First())
.ToList();
foreach (TaskSubItem item in giftTaks)
{
oms_wei_order_info order = GlobalConfig.lstOrder.FirstOrDefault(a => a.order_id == item.ObjectId);
if (order != null)
{
order.GiftSuccessed = item.Status == 1;
if (order.GiftSuccessed == false)
{
order.GiftErrorMsg = item.SysMsg;
}
}
}
}
}
public class OrderFilterConfig : PropertyNotifyObject
@@ -2408,7 +2436,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
/// <summary>
/// 隐藏标记
/// </summary>
public bool chkHideGreenFlagIsChecked
public bool chkHideGreenFlagIsChecked
{
get { return this.GetValue(x => x.chkHideGreenFlagIsChecked); }
set { this.SetValue(x => x.chkHideGreenFlagIsChecked, value); }