优化添加代发或取消代发的逻辑

This commit is contained in:
wule committed 2026-08-15 23:05:45 +08:00
1 parent 7ef75f8134
commit d06ec9badc
6 files changed
+76 -33

No files matched your search

@@ -513,14 +513,21 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// Api检测是否加入代发
if (orderItem.BuyGoodsBtnTxt == "云仓拍单" && !isAbnormalOrder)
{
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
if (!apiSearchDropship.Contains("\"errcode\":0"))
{
BaseMsgWindow.ShowError("查询代发失败!" + BaseRegex.GetStringJson(ref apiSearchDropship, "msg"));
return;
}
if (apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
{
var apiAddDropship = new WxApiBLL().WxApiDropshipAssign(orderItem.Shop, orderItem.order_id, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt());
if (!apiAddDropship.Contains("\"errcode\":0"))
{
BaseMsgWindow.ShowError("设置代发失败!请确商品已加入29供货商代发!" + BaseRegex.GetStringJson(ref apiAddDropship, "msg"));
return;
}
}
apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
if (apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
BaseMsgWindow.ShowError("店铺后台未查询到该代发单,请确商品已加入29供货商代发");
}
// 模拟检测是否加入代发
@@ -1155,6 +1162,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
directBuyOrder();
}
/// <summary>
/// 直发拍单
/// </summary>
void directBuyOrder()
{
var orderItem = this.DataContext as oms_wei_order_item_info;
@@ -1182,7 +1192,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
Thread.Sleep(2000);
Dispatcher.Invoke(new Action(() => { btnBuyOrder.IsEnabled = true; }));
});
Task.Run(() =>
Task.Run(async() =>
{
// 拍单前查询订单是否退款
var orderId = orderItem.order_id;
@@ -1217,13 +1227,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (apiSearchDropship.Contains("ds_order_id_list") && !apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
{
var dsOrderId = JsonHelper.JObjectParse(apiSearchDropship)["ds_order_id_list"].FirstOrDefault().ParseToString();
var apiCancelDropship = new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
}
apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
if (!apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
{
BaseMsgWindow.ShowError("代发查询失败,请确商品未加入代发");
return;
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
if (!apiCancelDropship.Contains("\"errcode\":0"))
{
BaseMsgWindow.ShowError("取消代发失败!请确商品未加入代发!" + BaseRegex.GetStringJsonByRegs(ref apiSearchDropship, apiSearchDropship, "errmsg"));
return;
}
}
@@ -1383,7 +1393,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
try
{
var rst = await WxApiBLL.WxSearchAndDropshipCancel(orderItem.Shop, orderItem.ItemOrder);
var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(orderItem.Shop, orderItem.ItemOrder);
if (rst == "success")
{
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);