优化拍单和oem每单费用读取

This commit is contained in:
wule committed 2026-11-20 20:39:10 +08:00
1 parent 7ccc1aae80
commit a0b25ae79c
13 files changed
+129 -75

No files matched your search

@@ -392,7 +392,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (buyer != null)
{
dicPddPickInfo[buyer] = JsonHelper.DeserializeJsonToObject<PddPickInfo>(noPickupPackageData);
SetPickUpNo(dicPddPickInfo[buyer]);
await SetPickUpNo(dicPddPickInfo[buyer]);
}
}
}
@@ -541,7 +541,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList;
}
List<order_item_ext> GetOrderItemExtInfo(string out_order_nos)
List<order_item_ext> GetOrderItemExtInfo(string out_order_nos)
{
if (out_order_nos.IsNullOrEmpty())
return new List<order_item_ext>();
@@ -734,8 +734,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 根据拼多多外采订单列表查询中转仓订单信息
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
// 根据拼多多外采订单列表查询订单扩展信息
var orderExtList = GetOrderItemExtInfo(out_order_nos);
// 根据拼多多外采订单列表查询中转仓额外订单信息
var transitExtraPackageList = OrderGetOrderListHelper.GetTransitExtraPackageList(out_order_nos);
// 根据拼多多外采订单列表查询订单扩展信息
var orderExtList = GetOrderItemExtInfo(out_order_nos);
// 根据仓库订单和扩展订单获取微信订单信息
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
@@ -2235,7 +2237,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (buyerOrder.WxSendTypeStr == "直发")
{
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill)
SendAsyncWaybillOrder(buyerOrder, true);
await SendAsyncWaybillOrder(buyerOrder, true);
else
SendOrderE57(buyerOrder);
}
@@ -2670,17 +2672,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return;
}
if (order.ShopOrderIdStr == "3739357317247975936")
{
}
//3739354841155797760
//3739338593856835840
//3739343419162669824
//3739334599561594624
//3739334374248562688
//3739334539482412288
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(shop, order.ShopOrderIdStr, 100);
if (!apiSearchDropship.Contains("\"errcode\":0"))
throw new Exception("同步单代发查询失败!" + BaseRegex.GetStringJson(ref apiSearchDropship, "msg"));
@@ -2714,7 +2705,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
html = GetHtml.PostUtf8(url, data);
// 更新拍单余额
StartUp.UpdateBalance();
await StartUp.UpdateBalance();
}
else
{
@@ -90,6 +90,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// 异常重拍的原中转仓订单信息
/// </summary>
public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null;
public oms_wei_external_procurement_log_info ExtraTransitWarehouseOrderInfo { get; set; } = null;
private string currentUrl = "";
private volatile bool _isWindowLoaded = false;
@@ -94,6 +94,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// 异常重拍的原中转仓订单信息
/// </summary>
public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null;
public oms_wei_external_procurement_log_info ExtraTransitWarehouseOrderInfo { get; set; } = null;
private string currentUrl = "";
private volatile bool _isWindowLoaded = false;