取消代发后再发送礼物单
This commit is contained in:
1 parent
a7f1891dd3
commit
7ef75f8134
17 files changed
+3028
-1718
No files matched your search
@@ -1217,7 +1217,7 @@ 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.order_id, dsOrderId, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt());
|
||||
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\":[]"))
|
||||
@@ -1377,20 +1377,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
giftType = GiftType._155;
|
||||
giftType = GiftType._160;
|
||||
}
|
||||
Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
|
||||
if (ret)
|
||||
var rst = await WxApiBLL.WxSearchAndDropshipCancel(orderItem.Shop, orderItem.ItemOrder);
|
||||
if (rst == "success")
|
||||
{
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
|
||||
if (ret)
|
||||
{
|
||||
orderItem.ItemOrder.gift_order_status = 1;
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
|
||||
});
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
orderItem.ItemOrder.gift_order_status = 1;
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
Reference in new issue
Block a user