优化拍单和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;
@@ -979,14 +979,17 @@ public class OrderGetOrderListHelper
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
public static async Task<List<oms_wei_transfer_extra_package>> GetTransitExtraPackageList(string order_ids)
public static async Task<List<oms_wei_transfer_extra_package>> GetTransitExtraPackageList(string order_ids, string out_order_nos = null)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_transfer_extra_package>();
var url3 = BaseClass.Build29WxObjString("order/wx_get_transfer_extra_package");
var data3 = UserLogin.GetSignaturex();
data3 += "&order_no=" + order_ids;
if (!string.IsNullOrEmpty(order_ids))
data3 += "&order_no=" + order_ids;
else if (!string.IsNullOrEmpty(out_order_nos))
data3 += "&out_order_no=" + out_order_nos;
var html3 = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = await GetHtml.PostUtf8Async(url3, data3);
@@ -1485,6 +1485,7 @@
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAbnormalOrderExtraBuy_Click"
Content="额外拍单"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnAbnormalOrderExtraBuyVisibility}" />
@@ -335,7 +335,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
public static async Task BuyOrder(oms_wei_order_item_info orderItem, bool isAutoBuy = false, bool isAbnormalOrder = false)
public static async Task BuyOrder(oms_wei_order_item_info orderItem, bool isAutoBuy = false, TransitOrderBuyStatusEnum buyStatusEnum = TransitOrderBuyStatusEnum.Normal)
{
if (orderItem == null)
{
@@ -361,7 +361,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
{
OrderListCtrl.InitOrderItemObservableProp(orderItem);
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder);
await MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder);
if (!isAutoBuy)
BaseMsgWindow.ShowError("已存在中转拍单信息,请核对后再拍单");
return;
@@ -380,16 +380,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
if (orderItem == null)
return;
if (isAbnormalOrder)
if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy)
orderItem.BtnAbnormalOrderRebuyVisibility = oldVisibility;
if (!isAbnormalOrder && orderItem.ItemTransitOrder != null)
if (buyStatusEnum == TransitOrderBuyStatusEnum.Normal && orderItem.ItemTransitOrder != null)
{
// 正常单有未作废订单的,不可再拍单
BaseMsgWindow.ShowAnimateMessage("该订单已有采购记录", "Error", 6);
return;
}
if (isAbnormalOrder && (orderItem.ItemOrder.status <= 21 || orderItem.ItemTransitOrder == null || orderItem.ItemTransitOrder.refund_status != "买手退款成功"))
if ((buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy || buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy) &&
(orderItem.ItemOrder.status <= 21 || orderItem.ItemTransitOrder == null || orderItem.ItemTransitOrder.refund_status != "买手退款成功"))
{
// 异常单不是被拼多多买家秒退的且已取号的,不可异常重拍
BaseMsgWindow.ShowAnimateMessage("该异常单不符合重拍条件", "Error", 6);
@@ -417,7 +418,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
orderRetry:
// 拍单前查询账户余额
if (!isAbnormalOrder)
if (buyStatusEnum != TransitOrderBuyStatusEnum.AbnormalReybuy)
{
// 强制使用软件而非erp拍单
if (GlobalConfig.BuyConfig.IsUseAppBalance)
@@ -493,7 +494,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
// Api检测是否加入代发
//if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商
//if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商
//{
// try
// {
@@ -526,15 +527,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
MainWindow.Instance.Dispatcher.Invoke(new Action(() =>
{
if (GlobalConfig.CurrentBuyPlatform == "pdd")
PddBuyOrder(orderItem, isAbnormalOrder, isAutoBuy);
//PddBuyOrderWpf(orderItem, isAbnormalOrder, isAutoBuy);
PddBuyOrder(orderItem, buyStatusEnum, isAutoBuy);
//PddBuyOrderWpf(orderItem, buyStatusEnum, isAutoBuy);
else if (GlobalConfig.CurrentBuyPlatform == "tb")
TbBuyOrderWpf(orderItem, isAbnormalOrder, isAutoBuy);
TbBuyOrderWpf(orderItem, buyStatusEnum, isAutoBuy);
}));
});
}
public static void TbBuyOrderWpf(oms_wei_order_item_info orderItem, bool isAbnormalOrder, bool isAutoBuy)
public static void TbBuyOrderWpf(oms_wei_order_item_info orderItem, TransitOrderBuyStatusEnum buyStatusEnum, bool isAutoBuy)
{
if (GlobalConfig.CurrentTaobaoBuyer == null)
{
@@ -554,8 +555,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
taobaoBuyView.ViewModel.InitUrl = "https://s.taobao.com/search?";
taobaoBuyView.ViewModel.IsMappingGoods = true;
}
if (isAbnormalOrder)
if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy)
taobaoBuyView.ViewModel.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
else if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy)
{
taobaoBuyView.ViewModel.ExtraTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
BaseMsgWindow.ShowError("暂不支持额外包裹单");
return;
}
new DialogWindow()
{
Title = "买手拍单 - 当前买手 " + GlobalConfig.CurrentTaobaoBuyer.buyer_nick,
@@ -573,7 +580,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Task.Run(async () =>
{
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商
{
try
{
@@ -591,7 +598,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
public static void PddBuyOrderWpf(oms_wei_order_item_info orderItem, bool isAbnormalOrder, bool isAutoBuy)
public static void PddBuyOrderWpf(oms_wei_order_item_info orderItem, TransitOrderBuyStatusEnum buyStatusEnum, bool isAutoBuy)
{
if (GlobalConfig.CurrentPddBuyer == null)
{
@@ -612,8 +619,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
pddBuyView.ViewModel.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";
pddBuyView.ViewModel.IsMappingGoods = true;
}
if (isAbnormalOrder)
if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy)
pddBuyView.ViewModel.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
else if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy)
{
pddBuyView.ViewModel.ExtraTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
BaseMsgWindow.ShowError("暂不支持额外包裹单");
return;
}
new DialogWindow()
{
Title = "买手拍单 - 当前买手 " + GlobalConfig.CurrentPddBuyer.buyer_nick,
@@ -631,7 +644,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Task.Run(async () =>
{
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商
{
try
{
@@ -649,7 +662,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
public static void PddBuyOrder(oms_wei_order_item_info orderItem, bool isAbnormalOrder, bool isAutoBuy)
public static void PddBuyOrder(oms_wei_order_item_info orderItem, TransitOrderBuyStatusEnum buyStatusEnum, bool isAutoBuy)
{
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance, orderItem, GlobalConfig.CurrentPddBuyer, orderItem.PddBuyMap);
buyOrderForm.IsAutoBuy = isAutoBuy;
@@ -681,8 +694,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
buyOrderForm.pnlBuy.Visible = true;
buyOrderForm.pnlMap.Visible = false;
}
if (isAbnormalOrder)
if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalReybuy)
buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
else if (buyStatusEnum == TransitOrderBuyStatusEnum.AbnormalExtraBuy)
buyOrderForm.ExtraTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
buyOrderForm.ShowDialog();
OrderListCtrl.IsAutoBuy = (buyOrderForm?.IsAutoBuy).ParseToBool();
@@ -690,7 +705,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Task.Run(async () =>
{
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder) // 异常拍单不改变订单供应商
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && buyStatusEnum == TransitOrderBuyStatusEnum.Normal) // 云仓拍单只有普通拍单需要修改绑定订单供应商
{
try
{
@@ -1223,12 +1238,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
transitAfterSaleWindow.ShowDialog();
}
/// <summary> 异常重拍 </summary>
private async void btnAbnormalOrderRebuy_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
if (orderItem.ItemOrder.status > 21 && orderItem.ItemTransitOrder != null && orderItem.ItemTransitOrder.refund_status == "买手退款成功")
await BuyOrder(orderItem, false, true);
await BuyOrder(orderItem, false, TransitOrderBuyStatusEnum.AbnormalReybuy);
}
}
/// <summary> 异常额外拍单 </summary>
private async void btnAbnormalOrderExtraBuy_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
if (orderItem.ItemOrder.status > 21 && orderItem.ItemTransitOrder != null && orderItem.ItemTransitOrder.refund_status == "买手退款成功")
await BuyOrder(orderItem, false, TransitOrderBuyStatusEnum.AbnormalExtraBuy);
}
}
+3 -3
View File
@@ -65,9 +65,9 @@ namespace _29WxOrderWpf
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
// 更新下每单扣费金额
BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
//BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
//BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
//BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
@@ -47,8 +47,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
TransitOrder = _transitInfo?.oms_wei_external_procurement_log_info;
else if (_transitInfo?.oms_wei_transfer_extra_package != null)
ExtraPackage = _transitInfo?.oms_wei_transfer_extra_package;
//PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
PackType = (_transitInfo?.TransitPackType).ParseToInt();
PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
}
private void mainGrid_Loaded(object sender, RoutedEventArgs e)