diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 9a07ce9..fd791a8 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -90,7 +90,7 @@
-
+
@@ -114,7 +114,7 @@
-
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index 7a03b29..c6220e6 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -81,9 +81,13 @@
-
+
-
+
+
+
+
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 6569704..1af5f56 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -1173,14 +1173,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
- //if (!GetIsAbnormalOrderRebuy(orderItem) && GlobalConfig.lstOrder.Any(o => o.orderItems
- // .Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
- //{
- // MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder);
- // BaseMsgWindow.ShowError("已存在中转拍单信息，请核对后再拍单");
- // return;
- //}
-
btnBuyOrder.Cursor = Cursors.Wait;
btnBuyOrder.IsEnabled = false;
Task.Run(() =>
@@ -1212,10 +1204,29 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 如果是退款单，弹出退款窗口
if (CheckIsRefund(orderItem))
return;
-
- // 检测买手号是否掉线
- if (GlobalConfig.CurrentPddBuyer.status == "在线")
+ // 查询订单是否在代发货中，如果代发需要取消代发
+ var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
+ if (!apiSearchDropship.Contains("\"errcode\":0"))
+ {
+ BaseMsgWindow.ShowError("代发查询失败，" + BaseRegex.GetStringJsonByRegs(ref apiSearchDropship, apiSearchDropship, "errmsg"));
+ return;
+ }
+ 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());
+ }
+ apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
+ if (!apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
+ {
+ BaseMsgWindow.ShowError("代发查询失败，请确商品未加入代发");
+ return;
+ }
+
+
+ // 检测买手号是否掉线
+ if (GlobalConfig.CurrentPddBuyer.status == "在线")
{
PddMobileLoginForm.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
}
@@ -1229,8 +1240,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
- //BaseMsgWindow.ShowAnimateMessage("触发成功！" + DateTime.Now.ParseToString(), "Msg", 5);
- //return;
// 打开拍单窗口
Dispatcher.Invoke(new Action(() =>
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 1e95431..3ae5133 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -32,7 +32,7 @@ namespace AllBase
/// 版本ID
///
- public static int VersionCount = 228;
+ public static int VersionCount = 229;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000";
diff --git a/Work/_29Tools/BLL/WxApiBLL.cs b/Work/_29Tools/BLL/WxApiBLL.cs
index 1703156..4fa0f14 100644
--- a/Work/_29Tools/BLL/WxApiBLL.cs
+++ b/Work/_29Tools/BLL/WxApiBLL.cs
@@ -85,7 +85,7 @@ namespace Work._29Tools.BLL
sb.Append(UserLogin.GetSignaturex());
sb.Append("&token=").Append(GetWxToken(shop).accessToken);
sb.Append("&order_id=").Append(orderId);
- sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"" + spuId + "\",\"sku_id\":\"" + skuId + "\",\"product_cnt\":" + cnt + "}]");
+ sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"").Append(spuId + "\",\"sku_id\":\"").Append(skuId + "\",\"product_cnt\":").Append(cnt).Append("}]");
var url = BaseClass.Build29WxObjString("product/wx_api_dropship_assign");
var data = sb.ToString();
@@ -94,5 +94,22 @@ namespace Work._29Tools.BLL
html = GetHtml.PostUtf8(url, data);
return html;
}
+
+ public string WxApiDropshipCancel(ShopLoginInfo shop, string orderId, string dropShopOrderId, string spuId, string skuId, int cnt)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.Append(UserLogin.GetSignaturex());
+ sb.Append("&token=").Append(GetWxToken(shop).accessToken);
+ sb.Append("&order_id=").Append(orderId);
+ sb.Append("&ds_order_id=").Append(dropShopOrderId);
+ sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"").Append(spuId).Append("\",\"sku_id\":\"").Append(skuId).Append("\",\"product_cnt\":").Append(cnt).Append("}]");
+
+ var url = BaseClass.Build29WxObjString("product/wx_api_dropship_cancel");
+ var data = sb.ToString();
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"errcode\":0"))
+ html = GetHtml.PostUtf8(url, data);
+ return html;
+ }
}
}
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
index 5bc42cb..9c3c90a 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
@@ -980,10 +980,10 @@ namespace TemuKJD.ToolForms
if (AbnormalTransitWarehouseOrderInfo == null)
{
JObject body = new JObject();
- body["orderNo"] = orderItem.order_id;
- body["orderSkuId"] = orderItem.sku_id;
- body["outOrderNo"] = txtBuyOrderId.Text.Trim();
- body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + "";
+ body["orderNo"] = orderItem.order_id; // 微信订单号
+ body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
+ body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号
+ body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerAccount"] = buyer.buyer_nick; // 买手昵称
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号